Update translations.

author: Andrei Karas <akaras@inbox.ru> 2015-11-21 14:57:00 +0300
committer: Andrei Karas <akaras@inbox.ru> 2015-11-21 14:57:00 +0300
commit: 5ea9419d9628247504a6eaa164b6f1c6b271955b (patch)
tree: 5b4cc922c5750ea614a07c4bc7b30a9fba63e01b
parent: f3511bcf5aac7a46958f9cdf1649be976679d257 (diff)
download: mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.gz
mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.bz2
mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.xz
mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.zip
40 files changed, 11046 insertions, 10410 deletions
diff --git a/po/ar.po b/po/ar.po
index d7c29a1f9..5df490294 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/akaras/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -354,53 +354,53 @@ msgstr[5] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -410,8 +410,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -438,40 +438,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "تثبيت"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "مرئية"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -481,6 +481,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -491,45 +492,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -543,13 +544,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -558,37 +559,37 @@ msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -771,23 +772,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1195,7 +1196,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1379,8 +1380,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1546,7 +1547,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1670,13 +1671,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1705,27 +1706,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1753,8 +1754,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1767,8 +1768,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1776,41 +1777,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1827,9 +1828,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1837,7 +1838,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1847,14 +1848,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "شراء"
 
@@ -1867,10 +1869,11 @@ msgstr "شراء"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "بيع"
 
@@ -1878,26 +1881,26 @@ msgstr "بيع"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1905,19 +1908,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1925,19 +1928,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1945,7 +1948,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1961,14 +1964,14 @@ msgstr "تجريد من العتاد"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1976,38 +1979,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2017,20 +2020,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2039,7 +2042,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2047,69 +2050,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2119,70 +2122,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2191,50 +2194,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2244,56 +2247,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "استخدام"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2301,155 +2304,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2457,60 +2460,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "إسقاط"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2557,12 +2560,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2573,259 +2576,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2836,8 +2844,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2853,12 +2861,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2871,10 +2892,10 @@ msgstr "مغادرة"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2883,11 +2904,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2896,16 +2915,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2919,59 +2938,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4316,7 +4335,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4741,7 +4760,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5400,7 +5419,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "الجردة"
 
@@ -5412,7 +5431,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5427,7 +5446,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "مهارات"
 
@@ -5507,7 +5526,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5555,21 +5574,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "إنشاء"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5622,7 +5642,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "كلمة السرّ:"
@@ -5665,7 +5685,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "الاسم:"
 
@@ -5676,8 +5696,8 @@ msgstr "الاسم:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5688,8 +5708,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5711,50 +5731,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
@@ -5770,25 +5800,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5797,44 +5827,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "إلغاء التسجيل"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5844,27 +5860,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6034,11 +6050,6 @@ msgstr ""
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6247,8 +6258,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "تسجيل"
 
@@ -6283,17 +6294,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "إضافة"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6374,105 +6374,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "التّالي"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6504,40 +6504,40 @@ msgid "Switch character"
 msgstr "تبديل الشخصيّة"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "تأكيد:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "البريد الإلكترونيّ:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6545,17 +6545,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6619,7 +6630,7 @@ msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6650,49 +6661,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6812,43 +6834,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6966,6 +6982,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "إلغاء التسجيل"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8201,12 +8224,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8397,11 +8420,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8774,66 +8792,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8965,7 +9008,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9114,6 +9157,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/bg.po b/po/bg.po
index 10dfb1ae0..cd5e55b45 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/akaras/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -477,6 +477,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1763,8 +1764,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1843,14 +1844,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1863,10 +1865,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1874,26 +1877,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4737,7 +4756,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr ""
 
@@ -5672,8 +5692,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5793,44 +5823,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/ca.po b/po/ca.po
index 18ddae9d5..3f5796213 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -34,7 +34,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -62,40 +62,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
@@ -437,40 +437,40 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -491,8 +491,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -504,32 +504,32 @@ msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -543,7 +543,7 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -558,37 +558,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -598,149 +598,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opcions:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Arxiu de registre a utilitzar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Mosta la versió"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Mostra aquesta ajuda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Directori de configuració a utilitzar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Inicia sessió amb aquest nom d'usuari"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Inicia sessió amb aquesta contrasenya"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Inicia sessió amb aquest personatge"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Servidor d'inici de sessió o IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port d'inici de sessió"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Selecciona servidor i personatge per defecte"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omet la descàrrega d'actualitzacions"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Directori de càrrega del joc"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Directori per a ser usat per desar informació"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Directori per a guardar captures de pantalla"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode : Comença el joc en mode segur"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s no existeix i no pot ser creat! Sortint."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Error creant el directori d'actualitzacions!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
@@ -758,36 +758,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1725,7 +1725,7 @@ msgstr "Crear grup"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2195,7 +2195,7 @@ msgstr "Agregar-los tots al intercanvi"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Botiga"
 
@@ -2247,7 +2247,7 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2444,7 +2444,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Deixar caure..."
 
@@ -2459,7 +2459,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Deixar caure"
 
@@ -2646,9 +2646,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Habilitat %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2843,7 +2842,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4794,7 +4793,7 @@ msgstr "Permet xiuxiueigs"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Esborra"
 
@@ -6098,12 +6097,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6726,16 +6725,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Afegir a la botiga \"vendre\"."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Text"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6893,62 +6891,62 @@ msgid "Command Editor"
 msgstr "Editor d'ordres"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "màgia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "altres"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Símbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Ordre:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipus d'objectiu:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Nivell Màgic:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Escola de màgia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Nivell d'escola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Guardar"
 
@@ -7095,25 +7093,25 @@ msgstr "Tria Món"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7121,7 +7119,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9182,9 +9180,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Habilitats"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10152,9 +10149,3 @@ msgstr "Segon  %d"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
-
-#~ msgid "Change Email"
-#~ msgstr "Canvia correu"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Punts de correcció: %d"
diff --git a/po/cs.po b/po/cs.po
index 52b7c2352..b4df3c5f1 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\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:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -67,40 +67,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
@@ -442,40 +442,40 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: 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:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -496,8 +496,8 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -509,32 +509,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -548,7 +548,7 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -563,37 +563,37 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -603,150 +603,150 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [možnosti] [soubor-manaplus]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[soubor-manaplus] : Manaplus soubor je XML soubor (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  používá se k nastavení vlastních parametrů"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  pro manaplus klienta."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Nastavení:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Použij logový soubor"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Složka uchování záznamu chatu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Zobraz verzi"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Zobraz tuto nápovědu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Použij adresář s konfigurací"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Přihlaš se tímto jménem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Přihlaš se tímto heslem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Přihlaš se k této postavě"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Přihlaš se k tomuto serveru nebo IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : Typ přihlašovacího serveru"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Přihlaš se k tomuto portu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Použít tohoto host pro update"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Vyber výchozí server postav a postavu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Přeskoč stahování aktualizací"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Adresář odkud načíst herní data"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Adresář který použít jako lokální uložiště dat"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Adresář pro snímky obrazovky"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Pro spuštění hry v bezpečném módu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Nastaví typ vykreslování"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s neexistuje a vytvoření selhalo. Končím."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Neplatný host pro update: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -764,36 +764,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1732,7 +1732,7 @@ msgstr "Vytvořit partu"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2202,7 +2202,7 @@ msgstr "Přidat vše k obchodu"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Uložit"
 
@@ -2254,7 +2254,7 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2451,7 +2451,7 @@ msgstr "Chránit předmět"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Upustit..."
 
@@ -2466,7 +2466,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Upustit"
 
@@ -2653,9 +2653,8 @@ msgstr "Človíček"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Dovednost %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2850,7 +2849,7 @@ msgstr "Úroveň: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4808,7 +4807,7 @@ msgstr "Povolit šeptání"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Smazat"
 
@@ -6115,12 +6114,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6745,16 +6744,15 @@ msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Přidat k prodeji."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Text"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6912,62 +6910,62 @@ msgid "Command Editor"
 msgstr "Editor příkazů"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "ostatní"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Příkaz:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Komentář:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Typ cíle:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Úroveň magie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Škola magie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Úroveň školy:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Uložit"
 
@@ -7112,25 +7110,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7138,7 +7136,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "n kl"
 
@@ -8914,9 +8912,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Vytvořit předměty"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9205,9 +9203,8 @@ msgstr "mazlíček"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Dovednosti"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10174,9 +10171,3 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
-
-#~ msgid "Change Email"
-#~ msgstr "Změnit email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Opravné body: %d"
diff --git a/po/de.po b/po/de.po
index 047760c39..125370c46 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,9 +34,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-19 15:56+0000\n"
+"Last-Translator: Valsu <valsu@hylia.de>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -59,7 +59,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -87,40 +87,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
@@ -463,40 +463,40 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -517,8 +517,8 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -530,32 +530,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -569,7 +569,7 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -584,37 +584,37 @@ msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
@@ -624,154 +624,154 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Die manaplus-Datei ist eine XML-Datei (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  genutzt um eigene Parameter zu setzen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  zum manaplus Client."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Optionen:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log-Datei benutzen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Verzeichnis für Chat-Logs"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Die Version des Spieles anzeigen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Diesen Hilfstext anzeigen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Zu benutzendes Konfigurationsverzeichnis"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Angegebenes Passwort benutzen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : Loginserver-Typ"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port des Loginservers"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Update host benutzen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 " -L --localdata-dir : Verzeichnis das als Lokales Verzeichnis benutzt werden "
 "soll"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Verzeichnis zum Speichern von Screenshots"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Spiel im sicheren Modus starten"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Renderer-Typ setzen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --Tests          : Treibertest und automatische Konfiguration starten"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : OpenGL für diese Sitzung deaktivieren"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Ungültiger Updateserver: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Fehler beim erstellen des Verzeichnisses für Updates!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fehler: %s existiert nicht und kann nicht erstellt werden! Beende..."
@@ -789,36 +789,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1707,7 +1707,7 @@ msgstr "Kommentar: %s"
 #: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
-msgstr ""
+msgstr "Effekte: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:348
@@ -1760,7 +1760,7 @@ msgstr "Gruppe erstellen"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2230,7 +2230,7 @@ msgstr "Alles zum Handeln hinzufügen"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -2282,7 +2282,7 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2479,7 +2479,7 @@ msgstr "Gegenstand schützen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
@@ -2494,7 +2494,7 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -2681,9 +2681,8 @@ msgstr "Humunkulus"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Fähigkeit %d"
+msgstr "Fähigkeitseinheit"
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2878,7 +2877,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4325,7 +4324,7 @@ msgstr "Nur erreichbare Monster automatisch anvisieren"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:119
 msgid "Select auto target for attack skills"
-msgstr ""
+msgstr "Automatischen Angriff für Angriffsfertigkeiten auswählen"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:123
@@ -4930,7 +4929,7 @@ msgstr "Besondere diagonale Geschwindigkeit bei Spielerbewegung benutzen"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Log players actions (for GM)"
-msgstr ""
+msgstr "Spieleraktionen loggen (für GMs)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
@@ -4972,7 +4971,7 @@ msgstr "Flüstern erlauben"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Löschen"
 
@@ -5363,7 +5362,7 @@ msgstr "GUI Transparenz"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:149
 msgid "Enable gui opacity"
-msgstr ""
+msgstr "Gui Transparenz einschalten"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_visual.cpp:154
@@ -6284,12 +6283,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
@@ -6772,7 +6771,7 @@ msgstr "Falsche E-Mail-Adresse."
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:236
 msgid "Email too long."
-msgstr ""
+msgstr "E-Mail ist zu lang."
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
@@ -6912,16 +6911,15 @@ msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Zum Verkaufsstand hinzufügen."
+msgstr "Text zum Skill %s hinzufügen"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Text"
+msgstr "Text: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -7079,62 +7077,62 @@ msgid "Command Editor"
 msgstr "Kommando Editor"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magisch"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "andere"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Befehl:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Art des Anvisierens:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magielevel:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magieschule:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Schul-Level:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Speichern"
 
@@ -7281,25 +7279,25 @@ msgstr "Welt auswählen"
 #. 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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JKnopf%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "Unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7307,7 +7305,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "UTaste"
 
@@ -9071,27 +9069,27 @@ msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 #. TRANSLATORS: error message
 #: src/net/eathena/skillrecv.cpp:273
 msgid "Fail summon."
-msgstr ""
+msgstr "Beschwörung fehlgeschlagen."
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "Hut %s angezogen."
+msgstr "Gegenstand %s benötigt."
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
 msgid "Need equipment %s and amount %d"
-msgstr ""
+msgstr "Gegenstand %s und Menge %d benötigt."
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Gegenstände erstellen"
+msgstr "Gegenstand %s benötigt."
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
 msgid "Need item %s and amount %d"
-msgstr ""
+msgstr "Gegenstand %s benötigt und Menge %d"
 
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
@@ -9375,9 +9373,8 @@ msgstr "Haustier"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Fähigkeiten"
+msgstr "Fähigkeit"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10275,31 +10272,31 @@ msgstr "Haustierfang gestartet."
 #: src/resources/notifications.h:776
 #, c-format
 msgid "Player %s died."
-msgstr ""
+msgstr "Spieler %s ist gestorben."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:780
 #, c-format
 msgid "Player %s logged out."
-msgstr ""
+msgstr "Spieler %s hat sich ausgeloggt."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:784
 #, c-format
 msgid "Player %s warped."
-msgstr ""
+msgstr "Spieler %s ist gewarped."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:788
 #, c-format
 msgid "Player %s trick dead."
-msgstr ""
+msgstr "Spieler %s täuschte Tod vor."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:792
 #, c-format
 msgid "Player %s unknown remove."
-msgstr ""
+msgstr "Unbekannte Entfernung von Spieler %s"
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
@@ -10362,9 +10359,3 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
-
-#~ msgid "Change Email"
-#~ msgstr "E-Mailadresse ändern"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Korrekturpunkte: %d"
diff --git a/po/en_GB.po b/po/en_GB.po
index 13940aeb4..bee34c75b 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/akaras/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -44,13 +44,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -267,25 +267,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -296,53 +296,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -351,53 +351,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, 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:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Setup"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -478,6 +478,7 @@ msgstr "Help"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -488,45 +489,45 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Close"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Logging in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -540,13 +541,13 @@ msgstr "Changing game servers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -555,37 +556,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -768,23 +769,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "Network Error"
 
@@ -1192,7 +1193,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1376,8 +1377,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1543,7 +1544,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1667,13 +1668,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1702,27 +1703,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1750,8 +1751,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "Trade"
 
@@ -1764,8 +1765,8 @@ msgstr "Trade"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1773,41 +1774,41 @@ msgstr "Attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1824,9 +1825,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Talk"
@@ -1844,14 +1845,15 @@ msgstr "Talk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "Buy"
 
@@ -1864,10 +1866,11 @@ msgstr "Buy"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "Sell"
 
@@ -1875,26 +1878,26 @@ msgstr "Sell"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1902,19 +1905,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1922,19 +1925,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1942,7 +1945,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1958,14 +1961,14 @@ msgstr "Unequip"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1973,38 +1976,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Players"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2014,20 +2017,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2036,7 +2039,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2044,69 +2047,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2116,70 +2119,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2188,50 +2191,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2241,56 +2244,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Use"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2298,155 +2301,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2454,60 +2457,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Drop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2554,12 +2557,12 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2570,259 +2573,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "Being"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monsters"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "Particle effects"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "Critical Hit"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "Misses"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2833,8 +2841,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
@@ -2850,12 +2858,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "Add"
+
+#. 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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2868,10 +2889,10 @@ msgstr "Exit"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2880,11 +2901,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2893,16 +2912,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
@@ -2916,59 +2935,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4313,7 +4332,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4738,7 +4757,7 @@ msgstr "Allow whispers"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5397,7 +5416,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -5409,7 +5428,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5424,7 +5443,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "Skills"
 
@@ -5504,7 +5523,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5552,21 +5571,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Create"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5619,7 +5639,7 @@ msgstr "Change Password"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Password:"
@@ -5662,7 +5682,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Name:"
 
@@ -5673,8 +5693,8 @@ msgstr "Name:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5685,8 +5705,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5708,50 +5728,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -5767,25 +5797,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Play"
@@ -5794,44 +5824,30 @@ msgstr "Play"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Unregister"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5841,27 +5857,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6031,11 +6047,6 @@ msgstr ""
 msgid "Equip"
 msgstr "Equip"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6236,8 +6247,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "Register"
 
@@ -6272,17 +6283,6 @@ msgstr ""
 msgid "Send"
 msgstr "Send"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "Add"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6363,105 +6363,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Next"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6493,40 +6493,40 @@ msgid "Switch character"
 msgstr "Switch character"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "Confirm:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Male"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Female"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6534,17 +6534,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6608,7 +6619,7 @@ msgid "Reset Windows"
 msgstr "Reset Windows"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6639,49 +6650,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "Up"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6801,43 +6823,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6955,6 +6971,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Failed adding item. You can not overlap one kind of item on the window."
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "Unregister"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8190,12 +8213,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8386,11 +8409,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8763,66 +8781,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8954,7 +8997,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9103,6 +9146,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/eo.po b/po/eo.po
index 3c58869b3..8144009b3 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -44,13 +44,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -267,25 +267,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr "I"
 
@@ -296,53 +296,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -351,53 +351,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, 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:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Helpo"
@@ -478,6 +478,7 @@ msgstr "Helpo"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -488,45 +489,45 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -540,13 +541,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -555,37 +556,37 @@ msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -768,23 +769,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1192,7 +1193,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1376,8 +1377,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1543,7 +1544,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr "Malamiko"
 
@@ -1667,13 +1668,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1702,27 +1703,27 @@ msgstr "Krei partion"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1750,8 +1751,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1764,8 +1765,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1773,41 +1774,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr "Sanigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1824,9 +1825,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Movi"
@@ -1834,7 +1835,7 @@ msgstr "Movi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Paroli"
@@ -1844,14 +1845,15 @@ msgstr "Paroli"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1864,10 +1866,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1875,26 +1878,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1902,19 +1905,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1922,19 +1925,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1942,7 +1945,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1958,14 +1961,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1973,38 +1976,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Ludantoj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2014,20 +2017,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2036,7 +2039,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2044,69 +2047,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Forlasi"
 
@@ -2116,70 +2119,70 @@ msgstr "Forlasi"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr "Nomo:                    "
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2188,50 +2191,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2241,56 +2244,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Uzi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2298,155 +2301,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr "Forigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr "Malignori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2454,60 +2457,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2554,12 +2557,12 @@ msgstr "Babilado"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr "Alia"
@@ -2570,259 +2573,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "NLR-oj"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstroj"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2833,8 +2841,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2850,12 +2858,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "Aldoni"
+
+#. 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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2868,10 +2889,10 @@ msgstr "Eliri"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr "+"
 
@@ -2880,11 +2901,9 @@ msgstr "+"
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr "-"
 
@@ -2893,16 +2912,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2916,59 +2935,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4313,7 +4332,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NLR"
 
@@ -4738,7 +4757,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5397,7 +5416,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5409,7 +5428,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5424,7 +5443,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5504,7 +5523,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5552,21 +5571,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr "Kvanto:"
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Krei"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5619,7 +5639,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5662,7 +5682,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -5673,8 +5693,8 @@ msgstr "Nomo:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ">"
@@ -5685,8 +5705,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr "<"
@@ -5708,50 +5728,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5767,25 +5797,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Ludi"
@@ -5794,44 +5824,30 @@ msgstr "Ludi"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5841,27 +5857,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6031,11 +6047,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6236,8 +6247,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6272,17 +6283,6 @@ msgstr ""
 msgid "Send"
 msgstr "Sendi"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "Aldoni"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6363,105 +6363,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6493,40 +6493,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Iĉa"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Ina"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "Retadreso:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6534,17 +6534,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6608,7 +6619,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6639,49 +6650,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6801,43 +6823,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "VP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "Laboro: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "Laboro:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6955,6 +6971,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8190,12 +8213,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8386,11 +8409,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8763,66 +8781,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8954,7 +8997,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9103,6 +9146,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/es.po b/po/es.po
index 2e273449e..25e223dff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-07 01:27+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -46,7 +46,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -74,40 +74,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
@@ -449,40 +449,40 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: 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:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -503,8 +503,8 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -516,32 +516,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -555,7 +555,7 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -570,37 +570,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -610,152 +610,152 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opciones] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "              usado para establecer parámetros personalizados."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "              al cliente manaplus."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opciones:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Archivo de registro a usar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Directorio de registro a usar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Muestra la versión"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Muestra esta ayuda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuración del directorio a usar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Acceder con este nombre de usuario"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Acceder con esta contraseña"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Acceder con este personaje"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Servidor de inicio de sesión o IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : Tipo de servidor de inicio de sesión"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Puerto del servidor de inicio de sesión"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Usar este host de actualización"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Carpeta desde la que se cargan los datos del juego"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 "     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode : Iniciar el juego en modo seguro"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer: Establecer tipo de renderizador"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Comenzar a probar controladores y auto configurar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Servidor de actualización inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -773,36 +773,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 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:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1743,7 +1743,7 @@ msgstr "Crear grupo"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2213,7 +2213,7 @@ msgstr "Agregar todo al intercambio"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Almacenar"
 
@@ -2265,7 +2265,7 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2462,7 +2462,7 @@ msgstr "Proteger artículo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Tirar..."
 
@@ -2477,7 +2477,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Tirar"
 
@@ -2664,9 +2664,8 @@ msgstr "Homúnculo"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Habilidad %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2861,7 +2860,7 @@ msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4852,7 +4851,7 @@ msgstr "Permitir mensajes privados"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Borrar"
 
@@ -6166,12 +6165,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
@@ -6796,16 +6795,15 @@ msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Agregar a la tienda (venta)."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Texto"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6963,62 +6961,62 @@ msgid "Command Editor"
 msgstr "Editor de comando"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "otro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Símbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ícono:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Maná:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Nivel de magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Escuela de magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Nivel de escuela:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Guardar"
 
@@ -7165,25 +7163,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7191,7 +7189,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "desc."
 
@@ -8959,9 +8957,9 @@ msgid "Fail summon."
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "tiene puesto el sombrero %s."
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
@@ -8969,9 +8967,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Crear artículos"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9260,9 +9258,8 @@ msgstr "mascota"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Habilidades"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10240,9 +10237,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Change Email"
-#~ msgstr "Cambiar correo"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Puntos de corrección: %d"
diff --git a/po/et.po b/po/et.po
index 3282f7f53..e2da25159 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/akaras/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Abi"
@@ -477,6 +477,7 @@ msgstr "Abi"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr "Abi"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Sulge"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1763,8 +1764,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1843,14 +1844,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1863,10 +1865,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1874,26 +1877,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr "Vestlus"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4737,7 +4756,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr ""
 
@@ -5672,8 +5692,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5793,44 +5823,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Järgmine"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Mees"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Naine"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/fa.po b/po/fa.po
index 692c76518..e09dbab06 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/akaras/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -349,53 +349,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -433,40 +433,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -476,6 +476,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -486,45 +487,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -553,37 +554,37 @@ msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -766,23 +767,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "خطای شبکه"
 
@@ -1190,7 +1191,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1374,8 +1375,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1541,7 +1542,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1665,13 +1666,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1700,27 +1701,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1748,8 +1749,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1762,8 +1763,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1771,41 +1772,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1822,9 +1823,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1832,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1842,14 +1843,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1862,10 +1864,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1873,26 +1876,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1900,19 +1903,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1920,19 +1923,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1940,7 +1943,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1956,14 +1959,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1971,38 +1974,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2012,20 +2015,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2034,7 +2037,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2042,69 +2045,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2114,70 +2117,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2186,50 +2189,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2239,56 +2242,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2296,155 +2299,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2452,60 +2455,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2552,12 +2555,12 @@ msgstr "چت"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2568,259 +2571,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2831,8 +2839,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2848,12 +2856,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2866,10 +2887,10 @@ msgstr "خروج"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2878,11 +2899,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2891,16 +2910,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "حداکثر"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2914,59 +2933,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4311,7 +4330,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4736,7 +4755,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5395,7 +5414,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5407,7 +5426,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5422,7 +5441,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5502,7 +5521,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5550,21 +5569,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "بساز"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5617,7 +5637,7 @@ msgstr "تغییر گذرواژه"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "گذرواژه:"
@@ -5660,7 +5680,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "نام:"
 
@@ -5671,8 +5691,8 @@ msgstr "نام:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5683,8 +5703,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5706,50 +5726,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5765,25 +5795,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5792,44 +5822,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "ثبت نام نشده"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5839,27 +5855,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6029,11 +6045,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6232,8 +6243,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6268,17 +6279,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6359,105 +6359,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "بعدی"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6489,40 +6489,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "مرد"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "زن"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6530,17 +6530,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6604,7 +6615,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6635,49 +6646,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6797,43 +6819,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6951,6 +6967,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "ثبت نام نشده"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8186,12 +8209,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8382,11 +8405,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8759,66 +8777,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8950,7 +8993,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9099,6 +9142,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/fi.po b/po/fi.po
index 1c93f8581..fb971614c 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -34,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -62,40 +62,40 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -436,40 +436,40 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -490,8 +490,8 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -503,32 +503,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -542,7 +542,7 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -557,37 +557,37 @@ msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -597,150 +597,150 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [asetukset] [manaplus-tiedosto]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  jolla asetetaan erikoisvalitsimia"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  manaplus-ohjelmalle."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Asetusvivut:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Näytä versionumero"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Näytä tämä ohje"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -758,36 +758,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1725,7 +1725,7 @@ msgstr "Luo ryhmä"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2195,7 +2195,7 @@ msgstr "Lisää kaikki kauppaan"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Varastoi"
 
@@ -2247,7 +2247,7 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2444,7 +2444,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Pudota..."
 
@@ -2459,7 +2459,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Pudota"
 
@@ -2646,9 +2646,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Taito %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2843,7 +2842,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4794,7 +4793,7 @@ msgstr "Salli kuiskaukset"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Poista"
 
@@ -6094,12 +6093,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6722,16 +6721,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Lisää myyntikauppaan."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Teksti"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6889,62 +6887,62 @@ msgid "Command Editor"
 msgstr "Komentomuokkain"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "muu"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symboli:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Komento:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Kuvake:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magiataso:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Tallenna"
 
@@ -7089,25 +7087,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7115,7 +7113,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9179,9 +9177,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Taidot"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10151,9 +10148,3 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Change Email"
-#~ msgstr "Vaihda sähköpostiosoite"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Korjauspisteitä: %d"
diff --git a/po/fr.po b/po/fr.po
index 42cfe27cb..2bc017cf4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
@@ -47,7 +47,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -75,40 +75,40 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
@@ -452,40 +452,40 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: 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:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -506,8 +506,8 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -519,32 +519,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -558,7 +558,7 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -573,37 +573,37 @@ msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -613,156 +613,156 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-file] : Le fichier manaplus est un fichier XML (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  utilisé pour définir des paramètres personnalisés"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  pour le client manaplus."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Options :"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : fichier journal à utiliser"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 " -a --chat-log-dir : Répertoire de l'historique de conversation à utiliser"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette rubrique d'aide"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type : Type de connexion au serveur"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr " -H --update-host : Utilise cet hôte de mise à jour"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 "  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Répertoire des données du jeu à charger"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Démarrer le jeu en mode sûr"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Définir le type de rendu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Commencer le test des drivers et la configuration "
 "automatique"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Hôte de mise à jour invalide : %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mises à jour !"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -781,37 +781,37 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 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:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1753,7 +1753,7 @@ msgstr "Créer un groupe"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2223,7 +2223,7 @@ msgstr "Ajouter tout dans l'échange"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Entreposer"
 
@@ -2275,7 +2275,7 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2472,7 +2472,7 @@ msgstr "Objet protégé"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Déposer..."
 
@@ -2487,7 +2487,7 @@ msgstr "Déposer tout"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Déposer"
 
@@ -2674,9 +2674,8 @@ msgstr "Homoncule"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Compétence %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2871,7 +2870,7 @@ msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4835,7 +4834,7 @@ msgstr "Autoriser les messages privés"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -6147,12 +6146,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6775,16 +6774,15 @@ msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Ajouter à la boutique de ventes."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Texte"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6946,62 +6944,62 @@ msgid "Command Editor"
 msgstr "Éditeur de commande"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "Magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Autre"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbole :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Commande :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Commentaire :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Type de Cible :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icône :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "École de magie :"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Niveau scolaire :"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -7148,25 +7146,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7174,7 +7172,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "touche u"
 
@@ -8942,9 +8940,9 @@ msgid "Fail summon."
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "chapeau équipé %s."
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
@@ -8952,9 +8950,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Créer des objets"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9243,9 +9241,8 @@ msgstr "familier"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Compétences"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10226,9 +10223,3 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
-
-#~ msgid "Change Email"
-#~ msgstr "Modifier l'adresse e-mail"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Points de correction : %d"
diff --git a/po/he.po b/po/he.po
index 90417f2e8..6861c1e45 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/akaras/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "הגדרות"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "וידאו"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "עזרה"
@@ -477,6 +477,7 @@ msgstr "עזרה"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr "עזרה"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "סגור"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "סחרר"
 
@@ -1763,8 +1764,8 @@ msgstr "סחרר"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr "תקוף"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "דבר"
@@ -1843,14 +1844,15 @@ msgstr "דבר"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "קנה"
 
@@ -1863,10 +1865,11 @@ msgstr "קנה"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "מכר"
 
@@ -1874,26 +1877,26 @@ msgstr "מכר"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr "הורד"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "שחקנים"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "אחסן"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "החזר"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "השתמש"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "השלך"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr "שיחה"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "נהיה"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "דמויות"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "מפלצות"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "מכה קריטית"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "פספוס"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr "יציאה"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "מקסימום"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4737,7 +4756,7 @@ msgstr "אפשר לחישות"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "ציוד"
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "כישורים"
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "צור"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr "שנה סיסמה"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "סיסמה:"
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "שם:"
 
@@ -5672,8 +5692,8 @@ msgstr "שם:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "אנא חלק %d נקודות"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוים בשם."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "שחק"
@@ -5793,44 +5823,30 @@ msgstr "שחק"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "בטל רישום"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr "השתמש"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "הרשם"
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr "שלח"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "הוסף"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "הבא"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "שלח"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "אפס"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr "החלף שחקן"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "אשר:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "זכר"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "נקבה"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "דוא\"ל:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "למעלה"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "חיים:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "נסיון:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "קסם:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "עבודה:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "בטל רישום"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/hr.po b/po/hr.po
index 978eec022..580f6c010 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/akaras/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -351,53 +351,53 @@ msgstr[2] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, 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:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
@@ -478,6 +478,7 @@ msgstr "Pomoć"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -488,45 +489,45 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -540,13 +541,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -555,37 +556,37 @@ msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -768,23 +769,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "Mreža Greška"
 
@@ -1192,7 +1193,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1376,8 +1377,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1543,7 +1544,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1667,13 +1668,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1702,27 +1703,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1750,8 +1751,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "Trgovanje"
 
@@ -1764,8 +1765,8 @@ msgstr "Trgovanje"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1773,41 +1774,41 @@ msgstr "Napad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1824,9 +1825,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Govori"
@@ -1844,14 +1845,15 @@ msgstr "Govori"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "Kupi"
 
@@ -1864,10 +1866,11 @@ msgstr "Kupi"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "Prodaj"
 
@@ -1875,26 +1878,26 @@ msgstr "Prodaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1902,19 +1905,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1922,19 +1925,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1942,7 +1945,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1958,14 +1961,14 @@ msgstr "Skini opremu"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1973,38 +1976,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2014,20 +2017,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2036,7 +2039,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2044,69 +2047,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2116,70 +2119,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2188,50 +2191,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2241,56 +2244,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Upotrijebi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2298,155 +2301,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2454,60 +2457,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Ispusti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2554,12 +2557,12 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2570,259 +2573,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "Biće"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Čudovišta"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "Promašaji"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2833,8 +2841,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
@@ -2850,12 +2858,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "Dodaj"
+
+#. 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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2868,10 +2889,10 @@ msgstr "Izlaz"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2880,11 +2901,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2893,16 +2912,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
@@ -2916,59 +2935,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4313,7 +4332,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4738,7 +4757,7 @@ msgstr "Dozvoli šapate"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5397,7 +5416,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "Zalihe"
 
@@ -5409,7 +5428,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5424,7 +5443,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "Vještine"
 
@@ -5504,7 +5523,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5552,21 +5571,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Stvori"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5619,7 +5639,7 @@ msgstr "Promijeni Lozinku"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Lozinka:"
@@ -5662,7 +5682,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Ime:"
 
@@ -5673,8 +5693,8 @@ msgstr "Ime:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5685,8 +5705,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5708,50 +5728,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -5767,25 +5797,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Igraj"
@@ -5794,44 +5824,30 @@ msgstr "Igraj"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Odjavi"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5841,27 +5857,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6031,11 +6047,6 @@ msgstr ""
 msgid "Equip"
 msgstr "Opremi"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6238,8 +6249,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -6274,17 +6285,6 @@ msgstr ""
 msgid "Send"
 msgstr "Pošalji"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "Dodaj"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6365,105 +6365,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Slijedeći"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "Dostavi"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "Poništi"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6495,40 +6495,40 @@ msgid "Switch character"
 msgstr "Promijeni lika"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "Potvrdi:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Muško"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Žensko"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "E-pošta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6536,17 +6536,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6610,7 +6621,7 @@ msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6641,49 +6652,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "Gore"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6803,43 +6825,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "Zadatak:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6957,6 +6973,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "Odjavi"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8192,12 +8215,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8388,11 +8411,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8765,66 +8783,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8956,7 +8999,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9105,6 +9148,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/hu.po b/po/hu.po
index 88f681e53..054d429e3 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/akaras/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Beállítások"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Videó"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Súgó"
@@ -477,6 +477,7 @@ msgstr "Súgó"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr "Súgó"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Bezár"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "Üzlet"
 
@@ -1763,8 +1764,8 @@ msgstr "Üzlet"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr "Támadás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Csevegés"
@@ -1843,14 +1844,15 @@ msgstr "Csevegés"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "Vétel"
 
@@ -1863,10 +1865,11 @@ msgstr "Vétel"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "Eladás"
 
@@ -1874,26 +1877,26 @@ msgstr "Eladás"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr "Nem használ"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Játékosok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Bevet"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Eldob"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "Nevek"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "Gépjátékos neve"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Szörny neve"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "Ha nincs találat."
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "Hozzáad"
+
+#. 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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr "Kilépés"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "Max."
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "Gépjátékos"
 
@@ -4737,7 +4756,7 @@ msgstr "Privát engedélyezése"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "Táska"
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "Képességek"
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Létrehozás"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr "Jelszó módosítása"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Jelszó:"
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Név:"
 
@@ -5672,8 +5692,8 @@ msgstr "Név:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "Játék"
@@ -5793,44 +5823,30 @@ msgstr "Játék"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 msgid "Info"
 msgstr "Infó"
 
-#. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: unregister dialog name
-#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Regisztráció megszüntetése"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr "Használ"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "Regisztráció"
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr "Küldés"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "Hozzáad"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Következő"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "Küldés"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr "Karakter változtatása"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "Megerősítés:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Férfi"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Nő"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "Fejleszt"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "Élet:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "TP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "Varázserő:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "Munka:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "Regisztráció megszüntetése"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/id.po b/po/id.po
index 89e8aa3b4..786c58f0e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -38,7 +38,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -66,40 +66,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
@@ -440,40 +440,40 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -494,8 +494,8 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -507,32 +507,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -546,7 +546,7 @@ msgstr "Mengganti server"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -561,37 +561,37 @@ msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -601,149 +601,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Update host tidak ada: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Kesalahan %s tidak ada dan tidak dapat dibuat! Keluar."
@@ -761,36 +761,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1729,7 +1729,7 @@ msgstr "Buat kelompok"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2199,7 +2199,7 @@ msgstr "Tambah semua ke dagangan"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Simpan"
 
@@ -2251,7 +2251,7 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2448,7 +2448,7 @@ msgstr "Proteksi item"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Buang..."
 
@@ -2463,7 +2463,7 @@ msgstr "Buang semua"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Buang"
 
@@ -2650,9 +2650,8 @@ msgstr "Orang"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Skill %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2847,7 +2846,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4796,7 +4795,7 @@ msgstr "Perbolehkan berbisik"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Hapus"
 
@@ -6095,12 +6094,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6721,16 +6720,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Tambahkan ke daftar jual."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Teks"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6888,62 +6886,62 @@ msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "sihir"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "lainnya"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Simbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Perintah:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipe target:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Level sihir:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Level sekolah:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Simpan"
 
@@ -7088,25 +7086,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7114,7 +7112,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9175,9 +9173,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Keahlian"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10145,6 +10142,3 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
-
-#~ msgid "Change Email"
-#~ msgstr "Ganti email"
diff --git a/po/it.po b/po/it.po
index ebd6046f6..a1647c6fc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -43,7 +43,7 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -71,40 +71,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
@@ -446,40 +446,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -500,8 +500,8 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -513,32 +513,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -552,7 +552,7 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -567,37 +567,37 @@ msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -607,152 +607,152 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opzioni:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log file da usare"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Visualizza la versione"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Visualizza l'aiuto"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configura la directory da usare"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Effettua il Login con questo username"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Effettua il Login con questa password"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Effettua il Login con questo personaggio"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Effettua il Login con questo nome Server o a questo "
 "indirizzo IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Effettua il Login a questa Server port"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Sceglie il personaggio e il server di default"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Non effettuare il download degli aggiornamenti"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Scegli la Directory per lanciare il gioco"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 "     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Lancia il gioco in modalità Sicura"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -770,36 +770,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1740,7 +1740,7 @@ msgstr "Crea gruppo"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2210,7 +2210,7 @@ msgstr "Aggiungi tutti"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2262,7 +2262,7 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2459,7 +2459,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Lascia..."
 
@@ -2474,7 +2474,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Lascia"
 
@@ -2661,9 +2661,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Abilità %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2858,7 +2857,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4809,7 +4808,7 @@ msgstr "Permetti sussurri"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Elimina"
 
@@ -6114,12 +6113,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6742,16 +6741,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Aggiungi allo shop di vendita."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Testo"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6909,62 +6907,62 @@ msgid "Command Editor"
 msgstr "Editor dei comandi"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "altro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Simbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Commento:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipo di target:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Livello magico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Scuola di magia:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Livello scuola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Salva"
 
@@ -7111,25 +7109,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7137,7 +7135,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9202,9 +9200,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Abilità"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10173,9 +10170,3 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
-
-#~ msgid "Change Email"
-#~ msgstr "Cambia email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Punti correzione: %d"
diff --git a/po/ja.po b/po/ja.po
index b3f8aa43f..6dbb7c70d 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -39,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -67,40 +67,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -440,40 +440,40 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -494,8 +494,8 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -507,32 +507,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -546,7 +546,7 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -561,37 +561,37 @@ msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -601,152 +601,152 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [オプション] [manaplus-ファイル]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  でカスタムパラメーターを設定しました"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  をmanaplusクライアントへ設定しました."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "オプション:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : 使用するログファイル"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : バージョンを表示"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : ヘルプメニュー表示"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : 使用する設定ファイル"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : この名前でログインする"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : このパスワードでログインする"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : このキャラクターでログインする"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : ログインサーバー又はIP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : ログインサーバーポート"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
 "ターを選択する"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : アップデートをスキップする"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : ゲームデータを読み込む場所"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : スクリーンショットの保存場所"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : セーフモードでゲームを始める"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラ!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません."
@@ -764,36 +764,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1731,7 +1731,7 @@ msgstr "パーティを作る"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2201,7 +2201,7 @@ msgstr "トレードウィンドウに全て追加する"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "保管"
 
@@ -2253,7 +2253,7 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2450,7 +2450,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "落とす..."
 
@@ -2465,7 +2465,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "落とす"
 
@@ -2652,9 +2652,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "スキル %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2849,7 +2848,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4800,7 +4799,7 @@ msgstr "全てのささやきを受け取る"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "削除"
 
@@ -6099,12 +6098,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6725,16 +6724,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "販売リストに追加."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "テキスト"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6892,62 +6890,62 @@ msgid "Command Editor"
 msgstr "コマンドエディタ"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "魔法"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "他"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "シンボル:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "コマンド:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "コメント:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "ターゲットタイプ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "アイコン:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "マナ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "魔法レベル:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "魔法学園:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "学校レベル:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "セーブ"
 
@@ -7094,25 +7092,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7120,7 +7118,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u キー"
 
@@ -9185,9 +9183,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "スキル"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10156,9 +10153,3 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Change Email"
-#~ msgstr "メールアドレス変更"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "修正点: %d"
diff --git a/po/ka.po b/po/ka.po
index 497adc22a..e0b52fe95 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/akaras/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -349,53 +349,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -433,40 +433,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -476,6 +476,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -486,45 +487,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -553,37 +554,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -766,23 +767,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1190,7 +1191,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1374,8 +1375,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1541,7 +1542,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1665,13 +1666,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1700,27 +1701,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1748,8 +1749,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1762,8 +1763,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1771,41 +1772,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1822,9 +1823,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1832,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1842,14 +1843,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1862,10 +1864,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1873,26 +1876,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1900,19 +1903,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1920,19 +1923,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1940,7 +1943,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1956,14 +1959,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1971,38 +1974,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2012,20 +2015,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2034,7 +2037,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2042,69 +2045,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2114,70 +2117,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2186,50 +2189,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2239,56 +2242,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2296,155 +2299,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2452,60 +2455,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2552,12 +2555,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2568,259 +2571,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2831,8 +2839,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2848,12 +2856,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2866,10 +2887,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2878,11 +2899,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2891,16 +2910,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2914,59 +2933,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4311,7 +4330,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4736,7 +4755,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5395,7 +5414,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5407,7 +5426,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5422,7 +5441,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5502,7 +5521,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5550,21 +5569,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5617,7 +5637,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5660,7 +5680,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr ""
 
@@ -5671,8 +5691,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5683,8 +5703,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5706,50 +5726,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5765,25 +5795,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5792,44 +5822,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5839,27 +5855,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6029,11 +6045,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6232,8 +6243,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6268,17 +6279,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6359,105 +6359,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6489,40 +6489,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6530,17 +6530,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6604,7 +6615,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6635,49 +6646,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6797,43 +6819,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6951,6 +6967,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8186,12 +8209,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8382,11 +8405,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8759,66 +8777,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8950,7 +8993,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9099,6 +9142,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index b8c0ad4ab..65fa16899 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: 2015-11-16 16:07+0300\n"
+"POT-Creation-Date: 2015-11-21 14:50+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"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -60,40 +60,40 @@ msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -488,8 +488,8 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -501,32 +501,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr ""
 
@@ -540,7 +540,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -555,37 +555,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -595,149 +595,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -755,36 +755,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr ""
 
@@ -1722,7 +1722,7 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2192,7 +2192,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2441,7 +2441,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr ""
 
@@ -2456,7 +2456,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr ""
 
@@ -2839,7 +2839,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4788,7 +4788,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr ""
 
@@ -6087,12 +6087,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6715,13 +6715,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:767
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
 msgstr ""
 
@@ -6881,62 +6881,62 @@ msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr ""
 
@@ -7081,25 +7081,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7107,7 +7107,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 025946894..198461e78 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/akaras/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjelp"
@@ -477,6 +477,7 @@ msgstr "Hjelp"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr "Hjelp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1763,8 +1764,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1843,14 +1844,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "Kjøp"
 
@@ -1863,10 +1865,11 @@ msgstr "Kjøp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "Selg"
 
@@ -1874,26 +1877,26 @@ msgstr "Selg"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spillere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Bruk"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "NPCer"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "Monstre"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr "Avslutt"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "Maks"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4737,7 +4756,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "Ferdigheter"
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Lag"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr "Endre passord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Passord:"
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Navn:"
 
@@ -5672,8 +5692,8 @@ msgstr "Navn:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vennligst distribuer %d poeng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "Navnet ditt må minst være 4 bokstaver."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5793,44 +5823,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Avregistrer"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "Registrer"
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr "Send"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Neste"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "Bekreft"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "Tilbakestill"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "Bekreft:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Mann"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Kvinne"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "Opp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "Avregistrer"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/nl.po b/po/nl.po
index e8ff855b3..3bee3455e 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -64,40 +64,40 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -438,40 +438,40 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -492,8 +492,8 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -505,32 +505,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -544,7 +544,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -559,37 +559,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -599,149 +599,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opties] [mana-bestand]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "              om manuele parameters te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "              aan de manaplus client."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opties:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Ongeldige opwaarderingshost %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -759,36 +759,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1728,7 +1728,7 @@ msgstr "Groep aanmaken"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2198,7 +2198,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2250,7 +2250,7 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2447,7 +2447,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2462,7 +2462,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2649,9 +2649,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Vaardigheid %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2846,7 +2845,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4795,7 +4794,7 @@ msgstr "Fluisteren toestaan"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -6100,12 +6099,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6728,16 +6727,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Toevoegen om te verkopen."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Tekst"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6895,62 +6893,62 @@ msgid "Command Editor"
 msgstr "Commando bewerker"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "ander"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbool:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Commando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Doel Type:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icoon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magie School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "School niveau:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Bewaren"
 
@@ -7097,25 +7095,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7123,7 +7121,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -9188,9 +9186,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Vaardigheden"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10159,9 +10156,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Change Email"
-#~ msgstr "Wijzig Email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Correctiepunten: %d"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e8ff855b3..3bee3455e 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -64,40 +64,40 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -438,40 +438,40 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -492,8 +492,8 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -505,32 +505,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -544,7 +544,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -559,37 +559,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -599,149 +599,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opties] [mana-bestand]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "              om manuele parameters te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "              aan de manaplus client."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opties:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Ongeldige opwaarderingshost %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -759,36 +759,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1728,7 +1728,7 @@ msgstr "Groep aanmaken"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2198,7 +2198,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2250,7 +2250,7 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2447,7 +2447,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2462,7 +2462,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2649,9 +2649,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Vaardigheid %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2846,7 +2845,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4795,7 +4794,7 @@ msgstr "Fluisteren toestaan"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -6100,12 +6099,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6728,16 +6727,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Toevoegen om te verkopen."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Tekst"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6895,62 +6893,62 @@ msgid "Command Editor"
 msgstr "Commando bewerker"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magie"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "ander"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbool:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Commando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Doel Type:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icoon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magie School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "School niveau:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Bewaren"
 
@@ -7097,25 +7095,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7123,7 +7121,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -9188,9 +9186,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Vaardigheden"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10159,9 +10156,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Change Email"
-#~ msgstr "Wijzig Email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Correctiepunten: %d"
diff --git a/po/pl.po b/po/pl.po
index 3bafd0590..5010c1f81 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -68,40 +68,40 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
@@ -443,40 +443,40 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: 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:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -497,8 +497,8 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -510,32 +510,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -549,7 +549,7 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -564,37 +564,37 @@ msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -604,149 +604,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opcje] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  używane do wprowadzania własnych parametrów"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  do klienta manaplus."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opcje:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Używany plik logów"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Folder do zapisywania logów"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Pokaż wersję"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Pokaż tą pomoc"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Zaloguj się tym loginem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Zaloguj się tym hasłem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Zaloguj się tą postacią"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Nazwa serwera lub IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port serwera"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : użyj tego hostu aktualizacyjnego"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omiń aktualizację"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog z danymi gry"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Ustawia rodzaj renderowania"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --test           : Rozpocznij test sterowników i autokonfigurację"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Nieprawidłowy host aktualizacyjny: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -764,36 +764,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1734,7 +1734,7 @@ msgstr "Utwórz grupę"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2204,7 +2204,7 @@ msgstr "Dodaj wszystko do handlu"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Podaj"
 
@@ -2256,7 +2256,7 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2453,7 +2453,7 @@ msgstr "Chroń przedmiot"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Upuść..."
 
@@ -2468,7 +2468,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Upuść"
 
@@ -2655,9 +2655,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Umiejętność %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2852,7 +2851,7 @@ msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4807,7 +4806,7 @@ msgstr "Zezwól na szepty"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Usuń"
 
@@ -6116,12 +6115,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6746,16 +6745,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Dodaj do sklepu (kupuj)."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Tekst"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6913,62 +6911,62 @@ msgid "Command Editor"
 msgstr "Edytor poleceń"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magia"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "inne"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Polecenie:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Komentarz:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Rodzaj celu:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Poziom magii:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Szkoła magii:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Poziom szkoły:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Zachowaj"
 
@@ -7115,25 +7113,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7141,7 +7139,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -8913,9 +8911,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Utwórz przedmioty"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9204,9 +9202,8 @@ msgstr "zwierzątko"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Zdolności"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10177,9 +10174,3 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
-
-#~ msgid "Change Email"
-#~ msgstr "Zmiana adresu e-mail"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Punkty korekcyjne: %d"
diff --git a/po/pt.po b/po/pt.po
index 8b8b7c35c..805029fe2 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -36,7 +36,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -64,40 +64,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -438,40 +438,40 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -492,8 +492,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -505,32 +505,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -544,7 +544,7 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -559,37 +559,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -599,154 +599,154 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opções] [manaplus-arquivo]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  usado para definir parâmetros customizados"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  para o cliente manaplus."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opções:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir : Diretório para log de chat"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host : Usar este host de update"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --testes          : Começar a testar drivers para auto configuração"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -764,36 +764,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1735,7 +1735,7 @@ msgstr "Criar grupo"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2205,7 +2205,7 @@ msgstr "Add. todos na negociação"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2257,7 +2257,7 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2454,7 +2454,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2469,7 +2469,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2656,9 +2656,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Habilidade %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2853,7 +2852,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4804,7 +4803,7 @@ msgstr "Permitir mensagens particulares"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
 
@@ -6112,12 +6111,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6740,16 +6739,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Adicionar na loja de venda."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Texto"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6907,62 +6905,62 @@ msgid "Command Editor"
 msgstr "Editor de comandos"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "Feitiço"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Outro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Símbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icone:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Nível da escola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Salvar"
 
@@ -7108,25 +7106,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7134,7 +7132,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "Tecla u"
 
@@ -9199,9 +9197,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Habilidades"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10170,9 +10167,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Change Email"
-#~ msgstr "Alterar email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Pontos de correção: %d"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f8c65d11e..87ed6a420 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -47,7 +47,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -75,40 +75,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
@@ -451,40 +451,40 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -505,8 +505,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -518,32 +518,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -557,7 +557,7 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -572,37 +572,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -612,153 +612,153 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "Manaplus [opções] [manaplus-arquivo]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  Usado para parâmetros customizados"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  Para o cliente Manaplus."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opções:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Diretório para registro de chat"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type: tipo de login do servidor"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Usar este host de update"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Define o tipo de renderização"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --testes         : Começa a testar drivers e a auto-configurar"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Host de atualização inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -776,36 +776,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1747,7 +1747,7 @@ msgstr "Criar grupo"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2217,7 +2217,7 @@ msgstr "Adicionar todos na negociação"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2269,7 +2269,7 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2466,7 +2466,7 @@ msgstr "Proteger item"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2481,7 +2481,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2668,9 +2668,8 @@ msgstr "Homúnculos"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Habilidade %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2865,7 +2864,7 @@ msgstr "Nível: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4820,7 +4819,7 @@ msgstr "Permitir mensagens particulares"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
 
@@ -6128,12 +6127,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6756,16 +6755,15 @@ msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Adicionar na loja de venda."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Texto"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6923,62 +6921,62 @@ msgid "Command Editor"
 msgstr "Editor de comandos"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "Feitiço"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Outro"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Símbolo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Comando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Icone:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Nível da escola:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Salvar"
 
@@ -7124,25 +7122,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7150,7 +7148,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla u"
 
@@ -8915,9 +8913,9 @@ msgid "Fail summon."
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "chapéu %s equipado."
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
@@ -8925,9 +8923,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Criar itens"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9216,9 +9214,8 @@ msgstr "animal de estimação"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Habilidades"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10193,9 +10190,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
-
-#~ msgid "Change Email"
-#~ msgstr "Alterar email"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Pontos de correção: %d"
diff --git a/po/ru.po b/po/ru.po
index 2643d770d..fef5df7c9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-05 18:48+0000\n"
-"Last-Translator: Роман Верменко <dargodet@gmail.com>\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 11:01+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
 "Language: ru\n"
@@ -46,7 +46,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -74,40 +74,40 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
@@ -450,40 +450,40 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -504,8 +504,8 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -517,32 +517,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -556,7 +556,7 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -571,37 +571,37 @@ msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -611,151 +611,151 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [параметры] [файл-manaplus]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  используется для указания дополнительных параметров"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  в клиенте."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Опции:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Использовать указанный файл как лог"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Использовать указанный каталог для лога"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показать версию"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показать эту справку"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Войти с указанным логином"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Войти с указанным паролем"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Использовать указанный персонаж"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Имя или IP сервера авторизации"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : Тип сервера"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт сервера авторизации"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Использовать этот узел обновлений"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропустить обновление"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Каталог для локальных данных"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Запуск игры в безопасном режиме"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Устанавливает тип рендера"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Некорректный сервер обновлений: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -773,36 +773,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1744,7 +1744,7 @@ msgstr "Создать группу"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2214,7 +2214,7 @@ msgstr "Добавить к торговле все"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Сохранить"
 
@@ -2266,7 +2266,7 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2463,7 +2463,7 @@ msgstr "Поставить защиту"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Бросить..."
 
@@ -2478,7 +2478,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Бросить"
 
@@ -2665,9 +2665,8 @@ msgstr "Гомункул"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Навык %d"
+msgstr "Объект скила"
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2862,7 +2861,7 @@ msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4823,7 +4822,7 @@ msgstr "Разрешить шептание"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Удалить"
 
@@ -6133,12 +6132,12 @@ msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
@@ -6625,7 +6624,7 @@ msgstr "Неправильный email."
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:236
 msgid "Email too long."
-msgstr ""
+msgstr "Email слишком длинный."
 
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
@@ -6765,16 +6764,15 @@ msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Добавить в список продажи."
+msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Текст"
+msgstr "Текст: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6932,62 +6930,62 @@ msgid "Command Editor"
 msgstr "Редактор команд"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "Магия"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Другое"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Символ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Команда:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Комментарий:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Тип цели:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Картинка:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Мана:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Уровень школы:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Сохранить"
 
@@ -7134,25 +7132,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7160,7 +7158,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "неиз."
 
@@ -8920,27 +8918,27 @@ msgstr "Вы несёте слишком много, чтобы сделать �
 #. TRANSLATORS: error message
 #: src/net/eathena/skillrecv.cpp:273
 msgid "Fail summon."
-msgstr ""
+msgstr "Ошибка вызова монстра."
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "Одета шапка: %s."
+msgstr "Необходимо снаряжение %s."
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
 msgid "Need equipment %s and amount %d"
-msgstr ""
+msgstr "Нужно снаряжение %s в количестве %d"
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Создание предметов"
+msgstr "Нужен предмет %s."
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
 msgid "Need item %s and amount %d"
-msgstr ""
+msgstr "Нужен предмет %s в количестве %d."
 
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
@@ -9224,9 +9222,8 @@ msgstr "животное"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Навыки"
+msgstr "Скил"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10199,9 +10196,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Change Email"
-#~ msgstr "Сменить адрес E-mail"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Очков навыков: %d"
diff --git a/po/sk.po b/po/sk.po
index f92bfd734..88fc37d7d 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/akaras/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -351,53 +351,53 @@ msgstr[2] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, 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:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Nastavenie"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápoveda"
@@ -478,6 +478,7 @@ msgstr "Nápoveda"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -488,45 +489,45 @@ msgstr "Nápoveda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "Zatvoriť"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -540,13 +541,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -555,37 +556,37 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -768,23 +769,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1192,7 +1193,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1376,8 +1377,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1543,7 +1544,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1667,13 +1668,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1702,27 +1703,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1750,8 +1751,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1764,8 +1765,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1773,41 +1774,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1824,9 +1825,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1844,14 +1845,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "Kúpiť"
 
@@ -1864,10 +1866,11 @@ msgstr "Kúpiť"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "Predaj"
 
@@ -1875,26 +1878,26 @@ msgstr "Predaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1902,19 +1905,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1922,19 +1925,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1942,7 +1945,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1958,14 +1961,14 @@ msgstr "Odstrojiť"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1973,38 +1976,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2014,20 +2017,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2036,7 +2039,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2044,69 +2047,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2116,70 +2119,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2188,50 +2191,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2241,56 +2244,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použiť"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2298,155 +2301,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2454,60 +2457,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Zahodiť"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2554,12 +2557,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2570,259 +2573,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2833,8 +2841,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2850,12 +2858,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2868,10 +2889,10 @@ msgstr "Ukončiť"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2880,11 +2901,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2893,16 +2912,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2916,59 +2935,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4313,7 +4332,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4738,7 +4757,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5397,7 +5416,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "Inventár"
 
@@ -5409,7 +5428,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5424,7 +5443,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "Schopnosti"
 
@@ -5504,7 +5523,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5552,21 +5571,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvoriť"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5619,7 +5639,7 @@ msgstr "Zmeniť heslo"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Heslo:"
@@ -5662,7 +5682,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "Meno:"
 
@@ -5673,8 +5693,8 @@ msgstr "Meno:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5685,8 +5705,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5708,50 +5728,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prosím rozdeľ %d bodov"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tvoje meno musí mať aspoň 4 písmená."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "Charakterové staty OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
@@ -5767,25 +5797,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5794,44 +5824,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Zrušiť registráciu"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5841,27 +5857,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6031,11 +6047,6 @@ msgstr ""
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6238,8 +6249,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "Registrovať"
 
@@ -6274,17 +6285,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6365,105 +6365,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "Nasledujúci"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6495,40 +6495,40 @@ msgid "Switch character"
 msgstr "Vymeniť postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "Žena"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6536,17 +6536,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6610,7 +6621,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6641,49 +6652,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6803,43 +6825,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6957,6 +6973,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "Zrušiť registráciu"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8192,12 +8215,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8388,11 +8411,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8765,66 +8783,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8956,7 +8999,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9105,6 +9148,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/sq.po b/po/sq.po
index 0d1130743..2813b5dc8 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/akaras/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -477,6 +477,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1763,8 +1764,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1843,14 +1844,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1863,10 +1865,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1874,26 +1877,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4737,7 +4756,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr ""
 
@@ -5672,8 +5692,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5793,44 +5823,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/sr.po b/po/sr.po
index d1de3f43b..79a66bf2f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -35,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -63,40 +63,40 @@ msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -438,40 +438,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Stil"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
@@ -492,8 +492,8 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -505,32 +505,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Povezivanje sa serverom"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Ulaz u svet"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Tražim karaktere"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Poverzujem se sa serverom za igru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Menjam server igre"
 
@@ -544,7 +544,7 @@ msgstr "Menjam server igre"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -559,37 +559,37 @@ msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Zahtevam detalje registracije"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Promena lozinke"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Lozinka je uspešno promenjena!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Izmena e-mail adrese"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "E-mail adresa je uspešno promenjena!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "De-registracija je uspela"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Zbogom, vrati se kad god poželiš..."
 
@@ -599,149 +599,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Opcije:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : datoteka za logovanje koja se koristi"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ne postoji i ne može da se napravi! Izlazim."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Greška prilikom kreiranja \"updates\" direktorijuma!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Greška: %s ne postoji i ne može da se napravi! Izlazim."
@@ -759,36 +759,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Opšte"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2196,7 +2196,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
@@ -2248,7 +2248,7 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2445,7 +2445,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr ""
 
@@ -2460,7 +2460,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr ""
 
@@ -2843,7 +2843,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4794,7 +4794,7 @@ msgstr "Dozvoli šaputanje"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Obriši"
 
@@ -6093,12 +6093,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6723,16 +6723,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:767
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Tekst"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6890,62 +6889,62 @@ msgid "Command Editor"
 msgstr "Editor komandi"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magija"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "ostalo"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Simbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Komanda:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Tip cilja:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikona:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magijski nivo:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Škola magije:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Školski nivo:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr ""
 
@@ -7090,25 +7089,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7116,7 +7115,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10145,6 +10144,3 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Bodovi ispravke: %d"
diff --git a/po/sv.po b/po/sv.po
index 8d946a082..b98e442f7 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -61,40 +61,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -489,8 +489,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -502,32 +502,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -541,7 +541,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -556,37 +556,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -596,152 +596,152 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  används för att sätta anpassade parameters"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  till manaplus-klienten."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Inställningar:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log-fil att använda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Visa version"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Visa hjälp"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Logga in med detta användarnamn"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Logga in med detta lösenord"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Logga in med denna karaktär"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Inloggningsserver-namn eller IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Loginserver-port"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog att ladda speldata från"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Starta spelet i felsäkert läge"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Börja testning av drivrutiner och automat-"
 "configurering"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Felaktig uppdaterings-host: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
@@ -759,36 +759,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1726,7 +1726,7 @@ msgstr "Skapa Party"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2196,7 +2196,7 @@ msgstr "Lägg till alla för trade"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Lagra"
 
@@ -2248,7 +2248,7 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2445,7 +2445,7 @@ msgstr "Skydda item"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2460,7 +2460,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Släng"
 
@@ -2647,9 +2647,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Skill %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2844,7 +2843,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4796,7 +4795,7 @@ msgstr "Tillåt viskningar"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
 
@@ -6106,12 +6105,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6734,16 +6733,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Lägg till i sell shop."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Text"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6901,62 +6899,62 @@ msgid "Command Editor"
 msgstr "Kommandotolk"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magic"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Annat"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Kommando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Target Typ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magic level:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magic School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "School level:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Spara"
 
@@ -7103,25 +7101,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7129,7 +7127,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8904,9 +8902,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Skapa items"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9195,9 +9193,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Skills"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10166,9 +10163,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Change Email"
-#~ msgstr "Ändra lösenord"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Correction points: %d"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 8d946a082..b98e442f7 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -61,40 +61,40 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -435,40 +435,40 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -489,8 +489,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -502,32 +502,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -541,7 +541,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -556,37 +556,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -596,152 +596,152 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : manaplus-filen är en XML-fil (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  används för att sätta anpassade parameters"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  till manaplus-klienten."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Inställningar:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log-fil att använda"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Katalog att använda för Chat-logg"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Visa version"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Visa hjälp"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Logga in med detta användarnamn"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Logga in med detta lösenord"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Logga in med denna karaktär"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Inloggningsserver-namn eller IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Loginserver-port"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : Använd detta för att uppdatera hosten"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Välj standard-karaktär server och karaktär"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Undvik uppdateringshemladdning"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog att ladda speldata från"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog att använda som lokal datakatalog"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog att lagra skärmdumpar i"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Starta spelet i felsäkert läge"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Börja testning av drivrutiner och automat-"
 "configurering"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Felaktig uppdaterings-host: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
@@ -759,36 +759,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1726,7 +1726,7 @@ msgstr "Skapa Party"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2196,7 +2196,7 @@ msgstr "Lägg till alla för trade"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Lagra"
 
@@ -2248,7 +2248,7 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2445,7 +2445,7 @@ msgstr "Skydda item"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2460,7 +2460,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Släng"
 
@@ -2647,9 +2647,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Skill %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2844,7 +2843,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4796,7 +4795,7 @@ msgstr "Tillåt viskningar"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
 
@@ -6106,12 +6105,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6734,16 +6733,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Lägg till i sell shop."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Text"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6901,62 +6899,62 @@ msgid "Command Editor"
 msgstr "Kommandotolk"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "magic"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "Annat"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Symbol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Kommando:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Target Typ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Ikon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Magic level:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Magic School:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "School level:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Spara"
 
@@ -7103,25 +7101,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7129,7 +7127,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8904,9 +8902,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Skapa items"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9195,9 +9193,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Skills"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10166,9 +10163,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Change Email"
-#~ msgstr "Ändra lösenord"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Correction points: %d"
diff --git a/po/te.po b/po/te.po
index 7ea628c01..70258d879 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/akaras/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -350,53 +350,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -434,40 +434,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "సహాయం"
@@ -477,6 +477,7 @@ msgstr "సహాయం"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -487,45 +488,45 @@ msgstr "సహాయం"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -539,13 +540,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -554,37 +555,37 @@ msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -767,23 +768,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1191,7 +1192,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1375,8 +1376,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1542,7 +1543,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1666,13 +1667,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1701,27 +1702,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1749,8 +1750,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1763,8 +1764,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1772,41 +1773,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1823,9 +1824,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1833,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1843,14 +1844,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1863,10 +1865,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1874,26 +1877,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1901,19 +1904,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1921,19 +1924,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1941,7 +1944,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1957,14 +1960,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1972,38 +1975,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2013,20 +2016,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2035,7 +2038,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2043,69 +2046,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2115,70 +2118,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2187,50 +2190,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2240,56 +2243,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2297,155 +2300,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2453,60 +2456,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2553,12 +2556,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2569,259 +2572,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2832,8 +2840,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2849,12 +2857,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2867,10 +2888,10 @@ msgstr "నిష్క్రమించు"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2879,11 +2900,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2892,16 +2911,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "గరిష్ఠ"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
@@ -2915,59 +2934,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4312,7 +4331,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4737,7 +4756,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5396,7 +5415,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5408,7 +5427,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5423,7 +5442,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5503,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5551,21 +5570,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "సృష్టించు"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5618,7 +5638,7 @@ msgstr "సంకేతపదాన్ని మార్చు"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "సంకేతపదం:"
@@ -5661,7 +5681,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "పేరు:"
 
@@ -5672,8 +5692,8 @@ msgstr "పేరు:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5684,8 +5704,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5707,50 +5727,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5766,25 +5796,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5793,44 +5823,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5840,27 +5856,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6030,11 +6046,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6235,8 +6246,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6271,17 +6282,6 @@ msgstr ""
 msgid "Send"
 msgstr "పంపించు"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6362,105 +6362,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "స్థాయి: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "తదుపరి"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6492,40 +6492,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "పురుషుడు"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "స్త్రీ"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "ఈమెయిల్:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6533,17 +6533,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6607,7 +6618,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6638,49 +6649,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6800,43 +6822,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6954,6 +6970,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8189,12 +8212,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8385,11 +8408,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8762,66 +8780,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8953,7 +8996,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9102,6 +9145,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/th.po b/po/th.po
index 0be406b50..8eef5a747 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/akaras/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -349,53 +349,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -433,40 +433,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "ตั้งค่า"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -476,6 +476,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -486,45 +487,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -553,37 +554,37 @@ msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -766,23 +767,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1190,7 +1191,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1374,8 +1375,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1541,7 +1542,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1665,13 +1666,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1700,27 +1701,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1748,8 +1749,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1762,8 +1763,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1771,41 +1772,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1822,9 +1823,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1832,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1842,14 +1843,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "ซื้อ"
 
@@ -1862,10 +1864,11 @@ msgstr "ซื้อ"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1873,26 +1876,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1900,19 +1903,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1920,19 +1923,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1940,7 +1943,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1956,14 +1959,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1971,38 +1974,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2012,20 +2015,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2034,7 +2037,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2042,69 +2045,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2114,70 +2117,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2186,50 +2189,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2239,56 +2242,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "ใช้"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2296,155 +2299,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2452,60 +2455,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "ทิ้ง"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2552,12 +2555,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2568,259 +2571,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2831,8 +2839,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2848,12 +2856,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2866,10 +2887,10 @@ msgstr "ออก"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2878,11 +2899,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2891,16 +2910,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2914,59 +2933,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4311,7 +4330,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4736,7 +4755,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5395,7 +5414,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5407,7 +5426,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5422,7 +5441,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5502,7 +5521,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5550,21 +5569,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "สร้าง"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5617,7 +5637,7 @@ msgstr "เปลี่ยนรหัสผ่าน"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "รหัสผ่าน:"
@@ -5660,7 +5680,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -5671,8 +5691,8 @@ msgstr "ชื่อ:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5683,8 +5703,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5706,50 +5726,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5765,25 +5795,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5792,44 +5822,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5839,27 +5855,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6029,11 +6045,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6232,8 +6243,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
@@ -6268,17 +6279,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6359,105 +6359,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "ถัดไป"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6489,40 +6489,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "ชาย"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "หญิง"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6530,17 +6530,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6604,7 +6615,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6635,49 +6646,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6797,43 +6819,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6951,6 +6967,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8186,12 +8209,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8382,11 +8405,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8759,66 +8777,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8950,7 +8993,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9099,6 +9142,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/tr.po b/po/tr.po
index 0c7d739a7..bf2ae62be 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -35,7 +35,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -63,40 +63,40 @@ msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
@@ -437,40 +437,40 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -491,8 +491,8 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -504,32 +504,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -543,7 +543,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -558,37 +558,37 @@ msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Kayıt silme başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -598,149 +598,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Seçenekler:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Kullanımı kütükle"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Versiyonu görüntüle"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Yardımı görüntüle"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Kullanılacak ayar klasörü"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Bu kullanıcı adı ile giriş yap"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Bu şifre ile giriş yap"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Bu karakter ile giriş yap"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Sunucu adına veya IP'ye giriş yap"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Sunucu Portuna Giriş yap"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Varsayılan karakter sunucusu ve karakteri seç"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Güncelleme indirmelerini atla"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Oyun bilgilerinin yükleneceği klasör"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Yerel bilgi klasörü olarak kullanılacak klasör"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Ekran görüntülerinin kaydedileceği klasör"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Oyunu güvenli modda başlat"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Geçersiz sunucu güncellemesi: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Güncelleme klasörleri yaratılırken hata oluştu!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
@@ -758,36 +758,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1729,7 +1729,7 @@ msgstr "Parti kur"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2199,7 +2199,7 @@ msgstr "Tamamını takasa ekle"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Sakla"
 
@@ -2251,7 +2251,7 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2448,7 +2448,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Bırak..."
 
@@ -2463,7 +2463,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Bırak"
 
@@ -2650,9 +2650,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Yetenek %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2847,7 +2846,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4799,7 +4798,7 @@ msgstr "Fısıltılara izin ver"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Sil"
 
@@ -6098,12 +6097,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6726,16 +6725,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Satış mağazasına ekle."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Metin"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6893,62 +6891,62 @@ msgid "Command Editor"
 msgstr "Komut Editörü"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "büyü"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "diğer"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Sembol:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Komut:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Hedef Tipi:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "İkon:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Mana:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Büyü Leveli:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Büyü Okulu:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Okul leveli:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Kayıt"
 
@@ -7095,25 +7093,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7121,7 +7119,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9182,9 +9180,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Yetenekler"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10152,9 +10149,3 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
-
-#~ msgid "Change Email"
-#~ msgstr "E-posta Değiştir"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Düzeltme puanları: %d"
diff --git a/po/uk.po b/po/uk.po
index 8dae9c2de..1ccef5c88 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -36,7 +36,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -64,40 +64,40 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
@@ -441,40 +441,40 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -495,8 +495,8 @@ msgstr "Довідка"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -508,32 +508,32 @@ msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -547,7 +547,7 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -562,37 +562,37 @@ msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "Акаунт видалено"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
@@ -602,151 +602,151 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [опції] [manaplus-файл]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-файл] : Файл manaplus це XML файл (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  використовується для додаткових параметрів"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  до manaplus клієнту."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "Параметри:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  - --log-file        : Лог-файл"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : Тека логу чату"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показати версію"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показати ще раз цю довідку"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 "  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Зареєструватися на сервері зі вказаним логіном"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Зареєструватися на сервері зі вказаним паролем"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Обрати в акаунті зазначеного персонажа"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Ім'я серверу або IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : Тип логін-серверу"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт логіну"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 "  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Обрати сервер та персонаж за замовчуванням"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропустити завантаження оновлення"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Тека з користувацькими ігровими ресурсами"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Тека з локальними даними"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Тека скріншотів"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Ввімкнути гру в безпечному режимі"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : Ввімкнути тип рендерингу"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --tests          : Стартувати тести та автоконфігурацію"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Вимкнути OpenGL під час цієї сесії"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "Тека %s не існує і не може бути створена! Виходимо."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Невідомий сервер оновлення: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "Неможливо створити теку для оновлень!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
@@ -764,36 +764,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1733,7 +1733,7 @@ msgstr "Створити групу"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2203,7 +2203,7 @@ msgstr "Додати всю кількість"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Зберегти"
 
@@ -2255,7 +2255,7 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2452,7 +2452,7 @@ msgstr "Захистити предмет"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "Кинути..."
 
@@ -2467,7 +2467,7 @@ msgstr "Кинути все"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Кинути"
 
@@ -2654,9 +2654,8 @@ msgstr "Гомункул"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "Вміння %d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2851,7 +2850,7 @@ msgstr "Рівень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4807,7 +4806,7 @@ msgstr "Дозволити шепіт (приватне спілкування)"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Видалити"
 
@@ -6111,12 +6110,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6741,16 +6740,15 @@ msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "Додати до списку продажу."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "Текст"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6908,62 +6906,62 @@ msgid "Command Editor"
 msgstr "Редактор команд"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "магія"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "інше"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "Символ:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "Команда:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr "Примітка:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "Тип цілі:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "Значок:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "Мана:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "Рівень мани:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "Школа магії:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "Рівень школи:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "Зберегти"
 
@@ -7108,25 +7106,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "клавіша_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr "КлавішаДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr "невідома клавіша"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7134,7 +7132,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "невід."
 
@@ -8906,9 +8904,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "Створення предметів"
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9197,9 +9195,8 @@ msgstr "улюбленець"
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "Вміння"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10168,9 +10165,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Change Email"
-#~ msgstr "Змінити адресу електронної пошти"
-
-#~ msgid "Correction points: %d"
-#~ msgstr "Балів вмінь: %d"
diff --git a/po/vls.po b/po/vls.po
index ddc89fdfb..9b9cd58fa 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/akaras/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -42,13 +42,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -265,25 +265,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -294,53 +294,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -349,53 +349,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -433,40 +433,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -476,6 +476,7 @@ msgstr ""
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -486,45 +487,45 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -553,37 +554,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -766,23 +767,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr ""
 
@@ -1190,7 +1191,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1374,8 +1375,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1541,7 +1542,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1665,13 +1666,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1700,27 +1701,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1748,8 +1749,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr ""
 
@@ -1762,8 +1763,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1771,41 +1772,41 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1822,9 +1823,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1832,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
@@ -1842,14 +1843,15 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr ""
 
@@ -1862,10 +1864,11 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr ""
 
@@ -1873,26 +1876,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1900,19 +1903,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1920,19 +1923,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1940,7 +1943,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1956,14 +1959,14 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1971,38 +1974,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2012,20 +2015,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2034,7 +2037,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2042,69 +2045,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2114,70 +2117,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2186,50 +2189,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2239,56 +2242,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2296,155 +2299,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2452,60 +2455,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2552,12 +2555,12 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2568,259 +2571,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2831,8 +2839,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2848,12 +2856,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2866,10 +2887,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr ""
 
@@ -2878,11 +2899,9 @@ msgstr ""
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr ""
 
@@ -2891,16 +2910,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2914,59 +2933,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4311,7 +4330,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr ""
 
@@ -4736,7 +4755,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5395,7 +5414,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr ""
 
@@ -5407,7 +5426,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5422,7 +5441,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr ""
 
@@ -5502,7 +5521,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5550,21 +5569,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5617,7 +5637,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5660,7 +5680,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr ""
 
@@ -5671,8 +5691,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5683,8 +5703,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5706,50 +5726,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5765,25 +5795,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr ""
@@ -5792,44 +5822,30 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr ""
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5839,27 +5855,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6029,11 +6045,6 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6234,8 +6245,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr ""
 
@@ -6270,17 +6281,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr ""
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6361,105 +6361,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6491,40 +6491,40 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6532,17 +6532,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6606,7 +6617,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6637,49 +6648,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6799,43 +6821,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6953,6 +6969,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr ""
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8188,12 +8211,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8384,11 +8407,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8761,66 +8779,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8952,7 +8995,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9101,6 +9144,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 538d38fd8..9a00d095e 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: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -68,40 +68,40 @@ msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -441,40 +441,40 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -495,8 +495,8 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -508,32 +508,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -547,7 +547,7 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -562,37 +562,37 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -602,149 +602,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "选项:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l--log-file        : 日志文件"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version       : 显示版本"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
@@ -762,36 +762,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1729,7 +1729,7 @@ msgstr "建立"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2199,7 +2199,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "存储"
 
@@ -2251,7 +2251,7 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2448,7 +2448,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "掉落..."
 
@@ -2463,7 +2463,7 @@ msgstr "所有"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丢弃"
 
@@ -2650,9 +2650,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "技能为%d"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2847,7 +2846,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4796,7 +4795,7 @@ msgstr "允许密语"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "删除"
 
@@ -6095,12 +6094,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6721,16 +6720,15 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
-#, fuzzy, c-format
+#: src/gui/windows/skilldialog.cpp:767
+#, c-format
 msgid "Add text to skill %s"
-msgstr "添加到出售商店."
+msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
-#, fuzzy
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
-msgstr "文本"
+msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
@@ -6888,62 +6886,62 @@ msgid "Command Editor"
 msgstr "命令编辑器"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr "魔术"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr "其他"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr "符号:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr "命令:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr "目标类型:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr "图示:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr "法力:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr "魔法等级:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr "魔法学院:"
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr "学校层次:"
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr "保存"
 
@@ -7088,25 +7086,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7114,7 +7112,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9177,9 +9175,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "技能"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
@@ -10146,6 +10143,3 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Change Email"
-#~ msgstr "变更电子邮件"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ebdd69594..50de419b4 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-11-16 16:07+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-21 14:50+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -34,7 +34,7 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
+#: src/actions/actions.cpp:162 src/client.cpp:1497 src/client.cpp:1532
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -62,40 +62,40 @@ msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1026 src/actions/actions.cpp:1039
+#: src/actions/actions.cpp:1036 src/actions/actions.cpp:1049
 msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1177 src/actions/actions.cpp:1183
+#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1193
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1240 src/actions/actions.cpp:1249
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1259
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1243 src/actions/actions.cpp:1253
+#: src/actions/actions.cpp:1253 src/actions/actions.cpp:1263
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1344
+#: src/actions/actions.cpp:1354
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
-#: src/actions/actions.cpp:1456
+#: src/actions/actions.cpp:1466
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
-#: src/actions/actions.cpp:1465
+#: src/actions/actions.cpp:1475
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1484
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
@@ -435,40 +435,40 @@ msgstr "浮動的泡泡"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:822 src/dyetool/client.cpp:474 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:819 src/dyetool/client.cpp:474
+#: src/client.cpp:825 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "性能"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:822 src/dyetool/client.cpp:477
+#: src/client.cpp:828 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:825 src/dyetool/client.cpp:480
+#: src/client.cpp:831 src/dyetool/client.cpp:483
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主題"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:828 src/dyetool/client.cpp:483
+#: src/client.cpp:834 src/dyetool/client.cpp:486
 msgid "About"
 msgstr "關於"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:837 src/dyetool/client.cpp:489 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
@@ -489,8 +489,8 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
-#: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:841 src/client.cpp:1411 src/client.cpp:1430
+#: src/dyetool/client.cpp:493 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
 #: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
@@ -502,32 +502,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1066 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "正在連接到伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1112 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "正在登入"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1151
+#: src/client.cpp:1161
 msgid "Entering game world"
 msgstr "正在進入遊戲"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1300
 msgid "Requesting characters"
 msgstr "正在查詢角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1340
 msgid "Connecting to the game server"
 msgstr "正在連接到遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1337
+#: src/client.cpp:1352
 msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
@@ -541,7 +541,7 @@ msgstr "正在轉換遊戲伺服器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
+#: src/client.cpp:1408 src/client.cpp:1427 src/client.cpp:1660
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:424
@@ -556,37 +556,37 @@ msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1446
 msgid "Requesting registration details"
 msgstr "正在查詢註冊的詳細信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1478
+#: src/client.cpp:1493
 msgid "Password Change"
 msgstr "更改密碼"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1480
+#: src/client.cpp:1495
 msgid "Password changed successfully!"
 msgstr "成功更改密碼!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1512
+#: src/client.cpp:1528
 msgid "Email Change"
 msgstr "更改電郵地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1514
+#: src/client.cpp:1530
 msgid "Email changed successfully!"
 msgstr "成功更改電郵地址!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1548
+#: src/client.cpp:1566
 msgid "Unregister Successful"
 msgstr "取消註冊成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1550
+#: src/client.cpp:1568
 msgid "Farewell, come back any time..."
 msgstr "再見了，隨時回來吧..."
 
@@ -596,149 +596,149 @@ msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:44
+#: src/commandline.cpp:45
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : 這個 manaplus 檔案是一個 XML 檔案 (.manaplus)"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:47
+#: src/commandline.cpp:48
 msgid "                  used to set custom parameters"
 msgstr "                  用於設置自定義參數"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:49
+#: src/commandline.cpp:51
 msgid "                  to the manaplus client."
 msgstr "                  至manaplus 客戶端."
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:52
+#: src/commandline.cpp:54
 msgid "Options:"
 msgstr "選項:"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:54
+#: src/commandline.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : 使用的日誌文件"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:56
+#: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
 msgstr "  -a --chat-log-dir   : 使用的聊天記錄目錄"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:58
+#: src/commandline.cpp:61
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version       : 顯示軟件版本"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:60
+#: src/commandline.cpp:63
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : 顯示這幫助"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:62
+#: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : 使用的配置目錄"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:65
+#: src/commandline.cpp:68
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : 使用的用戶名稱"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:67
+#: src/commandline.cpp:71
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : 使用的密碼"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:69
+#: src/commandline.cpp:74
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : 使用的角色"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:71
+#: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : 登錄的伺服器名稱或IP"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:73
+#: src/commandline.cpp:80
 msgid "  -y --server-type    : Login server type"
 msgstr "  -y --server-type    : 登錄的伺服器種類"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:75
+#: src/commandline.cpp:83
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : 登錄的伺服器端口"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:77
+#: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host    : 使用此更新主機"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:79
+#: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : 選擇默認的角色服務器和角色"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:82
+#: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : 跳過更新下載"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:84
+#: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : 加載遊戲數據的目錄"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:87
+#: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : 加載遊戲本地數據的目錄"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:90
+#: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : 儲存截圖的目錄"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:93
+#: src/commandline.cpp:106
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : 用安全模式開啟遊戲"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:95
+#: src/commandline.cpp:109
 msgid "     --renderer       : Set renderer type"
 msgstr "     --renderer       : 設置渲染器類型"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:97
+#: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --tests          : 開始測試驅動器和自動配置"
 
 #. TRANSLATORS: command line help
-#: src/commandline.cpp:101
+#: src/commandline.cpp:118
 msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : 在這次指令禁用OpenGL"
 
 #. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:53 src/dirs.cpp:353 src/dirs.cpp:368 src/dirs.cpp:413
-#: src/dirs.cpp:581 src/dirs.cpp:589
+#: src/configmanager.cpp:53 src/dirs.cpp:358 src/dirs.cpp:373 src/dirs.cpp:418
+#: src/dirs.cpp:587 src/dirs.cpp:595
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在且無法創建!正在退出."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:463
+#: src/dirs.cpp:468
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "無效的更新主機:%s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:504 src/dirs.cpp:511
+#: src/dirs.cpp:510 src/dirs.cpp:517
 msgid "Error creating updates directory!"
 msgstr "創建更新的目錄時遇到錯誤!"
 
-#: src/dirs.cpp:533 src/dirs.cpp:551
+#: src/dirs.cpp:539 src/dirs.cpp:557
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "錯誤:%s 不存在且無法創建!正在退出."
@@ -756,36 +756,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2197
+#: src/game.cpp:254 src/gui/windows/chatwindow.cpp:2197
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:260 src/gui/windowmenu.cpp:163
+#: src/game.cpp:261 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "調試"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:561
+#: src/game.cpp:562
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "截圖已保存為 %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:572
 msgid "Saving screenshot failed!"
 msgstr "保存截圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:658
+#: src/game.cpp:659
 msgid "The connection to the server was lost."
 msgstr "與服務器的連接中斷."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:661
+#: src/game.cpp:662
 msgid "Network Error"
 msgstr "網絡錯誤"
 
@@ -1723,7 +1723,7 @@ msgstr "選擇隊伍"
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
-#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:93 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
 msgid "Cancel"
@@ -2193,7 +2193,7 @@ msgstr "把 全部 加至交易"
 #: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
 #: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
-#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "儲存"
 
@@ -2245,7 +2245,7 @@ msgstr "取回 全部"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/inventorywindow.cpp:779 src/gui/windows/skilldialog.cpp:88
 #: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
 #: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2442,7 +2442,7 @@ msgstr "保護物件"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
-#: src/gui/windows/inventorywindow.cpp:893
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "丟棄..."
 
@@ -2457,7 +2457,7 @@ msgstr "丟棄全部"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丟棄"
 
@@ -2644,9 +2644,8 @@ msgstr "小矮人"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:205
-#, fuzzy
 msgid "Skill unit"
-msgstr "技能"
+msgstr ""
 
 #: src/gui/userpalette.cpp:210
 msgid "Party members"
@@ -2841,7 +2840,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:695 src/gui/windows/statuswindow.cpp:68
 #: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
@@ -4790,7 +4789,7 @@ msgstr "允許密語"
 #: src/gui/widgets/tabs/setup_relations.cpp:77
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
-#: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
+#: src/gui/windows/textcommandeditor.cpp:97 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "刪除"
 
@@ -6089,12 +6088,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1033
+#: src/gui/windows/inventorywindow.cpp:1040
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1042
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6715,13 +6714,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:767
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:768
+#: src/gui/windows/skilldialog.cpp:770
 msgid "Text: "
 msgstr ""
 
@@ -6881,62 +6880,62 @@ msgid "Command Editor"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:56
 msgid "magic"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:58
 msgid "other"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:57
+#: src/gui/windows/textcommandeditor.cpp:61
 msgid "Symbol:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:64
 msgid "Command:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:67
 msgid "Comment:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:67
+#: src/gui/windows/textcommandeditor.cpp:71
 msgid "Target Type:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:71
+#: src/gui/windows/textcommandeditor.cpp:75
 msgid "Icon:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:74
+#: src/gui/windows/textcommandeditor.cpp:79
 msgid "Mana:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:82
 msgid "Magic level:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:86
 msgid "Magic School:"
 msgstr ""
 
 #. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:89
 msgid "School level:"
 msgstr ""
 
 #. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:89
+#: src/gui/windows/textcommandeditor.cpp:95
 msgid "Save"
 msgstr ""
 
@@ -7081,25 +7080,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:378 src/input/inputmanager.cpp:422
-#: src/input/keyboardconfig.cpp:102
+#: src/input/inputmanager.cpp:380 src/input/inputmanager.cpp:424
+#: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:384
+#: src/input/inputmanager.cpp:386
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:398
+#: src/input/inputmanager.cpp:400
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:430
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7107,7 +7106,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:442 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:444 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -8867,9 +8866,9 @@ msgid "Fail summon."
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:282
-#, fuzzy, c-format
+#, c-format
 msgid "Need equipment %s."
-msgstr "已準備帽子 %s."
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:287
 #, c-format
@@ -8877,9 +8876,9 @@ msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Need item %s."
-msgstr "已準備帽子 %s."
+msgstr ""
 
 #: src/net/eathena/skillrecv.cpp:305
 #, c-format
@@ -9168,9 +9167,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown info name
 #: src/resources/db/skillunitdb.cpp:100
-#, fuzzy
 msgid "skill"
-msgstr "技能"
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ba09bc950..55ceb94ea 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: 2015-11-02 15:36+0300\n"
-"PO-Revision-Date: 2015-11-03 09:06+0000\n"
+"POT-Creation-Date: 2015-11-16 16:07+0300\n"
+"PO-Revision-Date: 2015-11-17 09:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/akaras/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:162 src/client.cpp:1479 src/client.cpp:1513
+#: src/actions/actions.cpp:162 src/client.cpp:1482 src/client.cpp:1516
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -43,13 +43,13 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:391
-#: src/gui/windows/charselectdialog.cpp:281
-#: src/gui/windows/charselectdialog.cpp:328 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charselectdialog.cpp:256
+#: src/gui/windows/charselectdialog.cpp:303 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
-#: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
 #: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:378
@@ -266,25 +266,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:453
+#: src/being/being.cpp:474
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:630
+#: src/being/being.cpp:651
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2151 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2213 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2156 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2218 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
@@ -295,53 +295,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:853
+#: src/being/localplayer.cpp:854
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:858
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:862
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:866
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:870
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:874
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:878
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:882
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:888
+#: src/being/localplayer.cpp:889
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:912
+#: src/being/localplayer.cpp:913
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -349,53 +349,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1084 src/being/localplayer.cpp:1085
-#: src/being/localplayer.cpp:1111
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1112
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1089 src/being/localplayer.cpp:1095
-#: src/being/localplayer.cpp:1101
+#: src/being/localplayer.cpp:1090 src/being/localplayer.cpp:1096
+#: src/being/localplayer.cpp:1102
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1120
+#: src/being/localplayer.cpp:1121
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1129
+#: src/being/localplayer.cpp:1130
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:2205
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2210 src/being/localplayer.cpp:2235
+#: src/being/localplayer.cpp:2211 src/being/localplayer.cpp:2236
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2220
+#: src/being/localplayer.cpp:2221
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2226 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2227 src/being/localplayer.cpp:2241
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2590
+#: src/being/localplayer.cpp:2591
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -405,8 +405,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/being/playerrelations.cpp:469 src/gui/popups/popupmenu.cpp:2325
+#: src/gui/popups/popupmenu.cpp:2367
 msgid "Completely ignore"
 msgstr ""
 
@@ -433,40 +433,40 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:814 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
+#: src/client.cpp:816 src/dyetool/client.cpp:471 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:817 src/dyetool/client.cpp:474
+#: src/client.cpp:819 src/dyetool/client.cpp:474
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:820 src/dyetool/client.cpp:477
+#: src/client.cpp:822 src/dyetool/client.cpp:477
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:823 src/dyetool/client.cpp:480
+#: src/client.cpp:825 src/dyetool/client.cpp:480
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:826 src/dyetool/client.cpp:483
+#: src/client.cpp:828 src/dyetool/client.cpp:483
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:829 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
+#: src/client.cpp:831 src/dyetool/client.cpp:486 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
@@ -476,6 +476,7 @@ msgstr "說明"
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close window
@@ -486,45 +487,45 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:833 src/client.cpp:1393 src/client.cpp:1412
+#: src/client.cpp:835 src/client.cpp:1396 src/client.cpp:1415
 #: src/dyetool/client.cpp:490 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
-#: src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:993 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:78 src/gui/windows/npcdialog.cpp:120
+#: src/gui/windows/npcdialog.cpp:80 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
 msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1054 src/gui/windowmanager_unittest.cc:145
+#: src/client.cpp:1056 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:162
+#: src/client.cpp:1102 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1151
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1285
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1325
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1337
 msgid "Changing game servers"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1390 src/client.cpp:1409 src/client.cpp:1639
+#: src/client.cpp:1393 src/client.cpp:1412 src/client.cpp:1642
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:387
-#: src/gui/windows/charselectdialog.cpp:325
+#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charselectdialog.cpp:300
 #: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:241
+#: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
 #: src/net/eathena/charserverrecv.cpp:351
 #: src/net/eathena/charserverrecv.cpp:355
@@ -553,37 +554,37 @@ msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1428
+#: src/client.cpp:1431
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1475
+#: src/client.cpp:1478
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1477
+#: src/client.cpp:1480
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1509
+#: src/client.cpp:1512
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1511
+#: src/client.cpp:1514
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1545
+#: src/client.cpp:1548
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1547
+#: src/client.cpp:1550
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -766,23 +767,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:559
+#: src/game.cpp:561
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:569
+#: src/game.cpp:571
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:661
 msgid "Network Error"
 msgstr "網路錯誤"
 
@@ -1190,7 +1191,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2639
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2653
 msgid "Revive"
 msgstr ""
 
@@ -1374,8 +1375,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2011
-#: src/gui/popups/popupmenu.cpp:2089 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2103 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1541,7 +1542,7 @@ msgstr ""
 
 #. TRANSLATORS: relation type
 #. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:159
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:160
 msgid "Enemy"
 msgstr ""
 
@@ -1665,13 +1666,13 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:331
+#: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:346
+#: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
 msgstr ""
@@ -1700,27 +1701,27 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:384
-#: src/gui/popups/popupmenu.cpp:452 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:635
-#: src/gui/popups/popupmenu.cpp:666 src/gui/popups/popupmenu.cpp:691
-#: src/gui/popups/popupmenu.cpp:716 src/gui/popups/popupmenu.cpp:905
-#: src/gui/popups/popupmenu.cpp:932 src/gui/popups/popupmenu.cpp:965
-#: src/gui/popups/popupmenu.cpp:1749 src/gui/popups/popupmenu.cpp:1786
-#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
-#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1990
-#: src/gui/popups/popupmenu.cpp:2068 src/gui/popups/popupmenu.cpp:2102
-#: src/gui/popups/popupmenu.cpp:2129 src/gui/popups/popupmenu.cpp:2150
-#: src/gui/popups/popupmenu.cpp:2171 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2531
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:456 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:730 src/gui/popups/popupmenu.cpp:919
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:979
+#: src/gui/popups/popupmenu.cpp:1763 src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1851 src/gui/popups/popupmenu.cpp:1893
+#: src/gui/popups/popupmenu.cpp:1934 src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2082 src/gui/popups/popupmenu.cpp:2116
+#: src/gui/popups/popupmenu.cpp:2143 src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2710 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:62 src/gui/windows/setupwindow.cpp:99
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:99
 #: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
 #: src/gui/windows/updaterwindow.cpp:189 src/input/pages/gui.cpp:103
@@ -1748,8 +1749,8 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:811
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:825
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:336
 msgid "Trade"
 msgstr "交易"
 
@@ -1762,8 +1763,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:828 src/gui/widgets/skillinfo.cpp:114
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:223
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1771,41 +1772,41 @@ msgstr "攻擊"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:473
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:260
+#: src/gui/popups/popupmenu.cpp:477
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:818
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:832
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:526 src/gui/popups/popupmenu.cpp:860
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:867
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:541
-#: src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:230 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:236
+#: src/gui/popups/popupmenu.cpp:237
 msgid "Nuke"
 msgstr ""
 
@@ -1822,9 +1823,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:659
-#: src/gui/popups/popupmenu.cpp:825 src/gui/popups/popupmenu.cpp:890
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:904
 #: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
@@ -1832,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:253 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:254 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "說話"
@@ -1842,14 +1843,15 @@ msgstr "說話"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2383
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:2397
+#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:168
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:151
 msgid "Buy"
 msgstr "購買"
 
@@ -1862,10 +1864,11 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2395
-#: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
-#: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2409
+#: src/gui/widgets/selldialog.cpp:53 src/gui/widgets/selldialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:144 src/gui/windows/buyselldialog.cpp:73
+#: src/gui/windows/shopwindow.cpp:170 src/input/pages/basic.cpp:250
+#: src/resources/db/npcdb.cpp:152
 msgid "Sell"
 msgstr "出售"
 
@@ -1873,26 +1876,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:483
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:487
+#: src/gui/popups/popupmenu.cpp:2507
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:305
+#: src/gui/popups/popupmenu.cpp:306
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:310
 msgid "Add to attack list"
 msgstr ""
 
@@ -1900,19 +1903,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:2527
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
+#: src/gui/popups/popupmenu.cpp:324 src/gui/popups/popupmenu.cpp:335
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:327
+#: src/gui/popups/popupmenu.cpp:328
 msgid "Fire"
 msgstr ""
 
@@ -1920,19 +1923,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:350
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:351
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:342
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:353
+#: src/gui/popups/popupmenu.cpp:354
 msgid "Drop loot"
 msgstr ""
 
@@ -1940,7 +1943,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:357 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1956,14 +1959,14 @@ msgstr "卸下裝備"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:360 src/gui/popups/popupmenu.cpp:620
-#: src/gui/windows/charselectdialog.cpp:130 src/gui/windows/shopwindow.cpp:192
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:624
+#: src/gui/windows/charselectdialog.cpp:105 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:364
+#: src/gui/popups/popupmenu.cpp:365
 msgid "Return to egg"
 msgstr ""
 
@@ -1971,38 +1974,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:379 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:383 src/gui/popups/popupmenu.cpp:553
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:429 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:433 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:2436
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:499 src/gui/popups/popupmenu.cpp:2450
+#: src/gui/popups/popupmenu.cpp:2474
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:582 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:586 src/gui/popups/popupmenu.cpp:595
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:1745
-#: src/gui/popups/popupmenu.cpp:1823 src/gui/popups/popupmenu.cpp:1865
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1837 src/gui/popups/popupmenu.cpp:1879
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:649
+#: src/gui/popups/popupmenu.cpp:621 src/gui/popups/popupmenu.cpp:657
 msgid "Map Item"
 msgstr ""
 
@@ -2012,20 +2015,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2098
+#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2112
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:630 src/gui/popups/popupmenu.cpp:655
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:663
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:670
 msgid "Move camera"
 msgstr ""
 
@@ -2034,7 +2037,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:694 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
@@ -2042,69 +2045,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:709 src/gui/windowmenu.cpp:124
+#: src/gui/popups/popupmenu.cpp:723 src/gui/windowmenu.cpp:124
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:726
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:743 src/gui/windows/npcdialog.cpp:117
+#: src/gui/popups/popupmenu.cpp:757 src/gui/windows/npcdialog.cpp:119
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:750
+#: src/gui/popups/popupmenu.cpp:764
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:756
+#: src/gui/popups/popupmenu.cpp:770
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:762
+#: src/gui/popups/popupmenu.cpp:776
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:768
+#: src/gui/popups/popupmenu.cpp:782
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:774
+#: src/gui/popups/popupmenu.cpp:788
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:794
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:787 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:801 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2114,70 +2117,70 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:792 src/gui/popups/popupmenu.cpp:2167
-#: src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2225
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:928
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:959
+#: src/gui/popups/popupmenu.cpp:973
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:1002
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:994
+#: src/gui/popups/popupmenu.cpp:1008
 msgid "Lock"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1043
+#: src/gui/popups/popupmenu.cpp:1057
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1045
+#: src/gui/popups/popupmenu.cpp:1059
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1063
+#: src/gui/popups/popupmenu.cpp:1077
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1652
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1646
+#: src/gui/popups/popupmenu.cpp:1660
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1651
+#: src/gui/popups/popupmenu.cpp:1665
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1659
+#: src/gui/popups/popupmenu.cpp:1673
 msgid "Add to trade all"
 msgstr ""
 
@@ -2186,50 +2189,50 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/popups/popupmenu.cpp:1681 src/gui/popups/popupmenu.cpp:1833
+#: src/gui/popups/popupmenu.cpp:1874 src/gui/windows/inventorywindow.cpp:263
 #: src/gui/windows/inventorywindow.cpp:287
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "寄放"
 
-#: src/gui/popups/popupmenu.cpp:1675
+#: src/gui/popups/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1694
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1688
+#: src/gui/popups/popupmenu.cpp:1702
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/popups/popupmenu.cpp:1712 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1720
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1733
 msgid "Retrieve all"
 msgstr ""
 
@@ -2239,56 +2242,56 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:2596
 #: src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:322
-#: src/gui/windows/skilldialog.cpp:486 src/gui/windows/skilldialog.cpp:569
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:88
+#: src/gui/windows/skilldialog.cpp:162 src/gui/windows/skilldialog.cpp:333
+#: src/gui/windows/skilldialog.cpp:507 src/gui/windows/skilldialog.cpp:590
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1875
+#: src/gui/popups/popupmenu.cpp:1889
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1920 src/gui/popups/popupmenu.cpp:1981
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1927 src/gui/popups/popupmenu.cpp:1988
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:1995
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1983
+#: src/gui/popups/popupmenu.cpp:1997
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2001 src/gui/windows/statuswindow.cpp:86
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2046
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2060
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2033 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2066
 msgid "Move down"
 msgstr ""
 
@@ -2296,155 +2299,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2490
+#: src/gui/popups/popupmenu.cpp:2139 src/gui/popups/popupmenu.cpp:2504
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2143
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2160
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2178
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2182
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2332 src/gui/popups/popupmenu.cpp:2350
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2364
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2260 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2335 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2310
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2263 src/gui/popups/popupmenu.cpp:2338
+#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2352
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2266 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2280 src/gui/popups/popupmenu.cpp:2313
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/popups/popupmenu.cpp:2323
-#: src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2283 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2328 src/gui/popups/popupmenu.cpp:2337
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2293
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2329
-#: src/gui/popups/popupmenu.cpp:2347
+#: src/gui/popups/popupmenu.cpp:2304 src/gui/popups/popupmenu.cpp:2322
+#: src/gui/popups/popupmenu.cpp:2334 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2361
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:2380
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2370
+#: src/gui/popups/popupmenu.cpp:2384
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2389 src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:2403 src/gui/popups/popupmenu.cpp:2427
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2401 src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2430
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2430 src/gui/popups/popupmenu.cpp:2454
+#: src/gui/popups/popupmenu.cpp:2444 src/gui/popups/popupmenu.cpp:2468
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2492
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2487
+#: src/gui/popups/popupmenu.cpp:2501
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2523
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2558
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/gui/popups/popupmenu.cpp:2581
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/windows/inventorywindow.cpp:216
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2600
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Drop all"
 msgstr ""
 
@@ -2452,60 +2455,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
+#: src/gui/popups/popupmenu.cpp:2620 src/gui/windowmenu.cpp:128
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2631
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2647
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2650
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/gui/popups/popupmenu.cpp:2658
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2652 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2660 src/gui/popups/popupmenu.cpp:2664
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
+#: src/gui/popups/popupmenu.cpp:2674 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2682
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2673 src/gui/popups/popupmenu.cpp:2677
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2685
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2691
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2703
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2552,12 +2555,12 @@ msgstr "聊天"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:377
+#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:265
 #: src/gui/widgets/tabs/setup_other.cpp:350
 #: src/gui/widgets/tabs/setup_visual.cpp:202
-#: src/gui/windows/registerdialog.cpp:101 src/input/pages/chat.cpp:145
+#: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
 msgstr ""
@@ -2568,259 +2571,264 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:130
 msgid "Beings"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:135
 msgid "Being"
 msgstr "物件"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:145
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:150
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:155
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:164
+#: src/gui/userpalette.cpp:165
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:170
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:175
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:180
 msgid "NPCs"
 msgstr "電腦"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:184 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:185 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "怪物"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:189
+#: src/gui/userpalette.cpp:190
 msgid "Pets"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:195
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:199
+#: src/gui/userpalette.cpp:200
 msgid "Homunculus"
 msgstr ""
 
-#: src/gui/userpalette.cpp:204
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:205
+msgid "Skill unit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:210
 msgid "Party members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:209
+#: src/gui/userpalette.cpp:215
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:214 src/gui/userpalette.cpp:219
-#: src/gui/userpalette.cpp:224
+#: src/gui/userpalette.cpp:220 src/gui/userpalette.cpp:225
+#: src/gui/userpalette.cpp:230
 #, c-format
 msgid "Team %d"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:227
+#: src/gui/userpalette.cpp:233
 msgid "Particles"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:232 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:238 src/gui/widgets/tabs/setup_visual.cpp:163
 msgid "Particle effects"
 msgstr "粒子效果"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:237
+#: src/gui/userpalette.cpp:243
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:242
+#: src/gui/userpalette.cpp:248
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:245
+#: src/gui/userpalette.cpp:251
 msgid "Hp bars"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:250
+#: src/gui/userpalette.cpp:256
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:255
+#: src/gui/userpalette.cpp:261
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:261
+#: src/gui/userpalette.cpp:267
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:267
+#: src/gui/userpalette.cpp:273
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:271
+#: src/gui/userpalette.cpp:277
 msgid "Hits"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:276
+#: src/gui/userpalette.cpp:282
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:281
+#: src/gui/userpalette.cpp:287
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:286
+#: src/gui/userpalette.cpp:292
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:291
+#: src/gui/userpalette.cpp:297
 msgid "Critical Hit"
 msgstr "致命一擊"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:296
+#: src/gui/userpalette.cpp:302
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:301
+#: src/gui/userpalette.cpp:307
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:306
+#: src/gui/userpalette.cpp:312
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:310
+#: src/gui/userpalette.cpp:316
 msgid "Misses"
 msgstr "失誤"
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:319
 msgid "Tiles"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:318
+#: src/gui/userpalette.cpp:324
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:323
+#: src/gui/userpalette.cpp:329
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:329
+#: src/gui/userpalette.cpp:335
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:335
+#: src/gui/userpalette.cpp:341
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:341
+#: src/gui/userpalette.cpp:347
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:347
+#: src/gui/userpalette.cpp:353
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:353
+#: src/gui/userpalette.cpp:359
 msgid "Tiles border"
 msgstr ""
 
 #. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:356
+#: src/gui/userpalette.cpp:362
 msgid "Ranges"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:361
+#: src/gui/userpalette.cpp:367
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:367
+#: src/gui/userpalette.cpp:373
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:373
+#: src/gui/userpalette.cpp:379
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:382
+#: src/gui/userpalette.cpp:388
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:388
+#: src/gui/userpalette.cpp:394
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:394
+#: src/gui/userpalette.cpp:400
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:400
+#: src/gui/userpalette.cpp:406
 msgid "Road point"
 msgstr ""
 
@@ -2831,8 +2839,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
-#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:68
+#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:330
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
@@ -2848,12 +2856,25 @@ msgid "Open url"
 msgstr ""
 
 #. TRANSLATORS: sell dialog button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/widgets/selldialog.cpp:106 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+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:101 src/gui/windows/buydialog.cpp:277
+#: src/gui/widgets/selldialog.cpp:110 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
 #: src/input/pages/basic.cpp:220
@@ -2866,10 +2887,10 @@ msgstr "離開"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
+#: src/gui/widgets/selldialog.cpp:128 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:113
-#: src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/statuswindow.cpp:741
 msgid "+"
 msgstr "增加"
 
@@ -2878,11 +2899,9 @@ msgstr "增加"
 #. 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:121 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:130 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:115
-#: src/gui/windows/statuswindow.cpp:779
+#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:117
 msgid "-"
 msgstr "減少"
 
@@ -2891,16 +2910,16 @@ msgstr "減少"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
+#: src/gui/widgets/selldialog.cpp:132 src/gui/windows/buydialog.cpp:299
+#: src/gui/windows/statuswindow.cpp:478 src/gui/windows/statuswindow.cpp:534
+#: src/gui/windows/statuswindow.cpp:739 src/gui/windows/statuswindow.cpp:761
 msgid "Max"
 msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/widgets/selldialog.cpp:139 src/gui/widgets/selldialog.cpp:352
+#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:678
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
@@ -2914,59 +2933,59 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:482
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:503
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:99
+#: src/gui/widgets/skillinfo.cpp:104
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:104 src/gui/windows/equipmentwindow.cpp:678
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:678
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:114
+#: src/gui/widgets/skillinfo.cpp:119
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:119
+#: src/gui/widgets/skillinfo.cpp:124
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:124
+#: src/gui/widgets/skillinfo.cpp:129
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:129
+#: src/gui/widgets/skillinfo.cpp:134
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:134
+#: src/gui/widgets/skillinfo.cpp:139
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:138
+#: src/gui/widgets/skillinfo.cpp:143
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:144
+#: src/gui/widgets/skillinfo.cpp:149
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:150
+#: src/gui/widgets/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -4311,7 +4330,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:89
+#: src/gui/widgets/tabs/setup_other.cpp:285 src/gui/windows/npcdialog.cpp:91
 msgid "NPC"
 msgstr "NPC"
 
@@ -4736,7 +4755,7 @@ msgstr "允許密語"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
 #: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/textcommandeditor.cpp:91 src/input/pages/gui.cpp:109
 msgid "Delete"
@@ -5395,7 +5414,7 @@ msgstr ""
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
-#: src/inventory.cpp:308
+#: src/inventory.cpp:309
 msgid "Inventory"
 msgstr "物品攔"
 
@@ -5407,7 +5426,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
-#: src/inventory.cpp:324
+#: src/inventory.cpp:325
 msgid "Cart"
 msgstr ""
 
@@ -5422,7 +5441,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:69
+#: src/gui/windowmenu.cpp:110 src/gui/windows/skilldialog.cpp:80
 msgid "Skills"
 msgstr "技能"
 
@@ -5502,7 +5521,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:158 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:329
+#: src/inventory.cpp:330
 msgid "Mail"
 msgstr ""
 
@@ -5550,21 +5569,22 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/buydialog.cpp:274
 msgid "Amount:"
 msgstr ""
 
+#. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:637
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "創造"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:316
+#: src/gui/windows/buydialog.cpp:336
 msgid "Filter:"
 msgstr ""
 
@@ -5617,7 +5637,7 @@ msgstr "變更密碼"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:75
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "密碼:"
@@ -5660,7 +5680,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
 #: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
-#: src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/registerdialog.cpp:73
 msgid "Name:"
 msgstr "名字:"
 
@@ -5671,8 +5691,8 @@ msgstr "名字:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:207
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/outfitwindow.cpp:63
 msgid ">"
 msgstr ""
@@ -5683,8 +5703,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:199
-#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:210
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "<"
 msgstr ""
@@ -5706,50 +5726,60 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:510
+#: src/gui/windows/charcreatedialog.cpp:552
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:212
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:229
 #: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:242
+#: src/gui/windows/charcreatedialog.cpp:250
 msgid "M"
 msgstr ""
 
+#. TRANSLATORS: one char size other character gender
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/charcreatedialog.cpp:237
+#: src/gui/windows/charcreatedialog.cpp:254
+#: src/gui/windows/inventorywindow.cpp:218
+msgid "O"
+msgstr ""
+
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/charcreatedialog.cpp:244
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:389
+#: src/gui/windows/charcreatedialog.cpp:426
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:500
+#: src/gui/windows/charcreatedialog.cpp:542
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:516
+#: src/gui/windows/charcreatedialog.cpp:558
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -5765,25 +5795,25 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:627
+#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/charselectdialog.cpp:598
 #: src/gui/windows/updaterwindow.cpp:191
 msgid "Play"
 msgstr "開始"
@@ -5792,44 +5822,30 @@ msgstr "開始"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80 src/net/ea/charserverrecv.cpp:130
+#: src/gui/windows/charselectdialog.cpp:76 src/net/ea/charserverrecv.cpp:130
 #: src/net/eathena/charserverrecv.cpp:374
 #: src/net/eathena/charserverrecv.cpp:410
 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/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "取消註冊"
-
-#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:120
-msgid "Change Email"
-msgstr ""
-
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:164
+#: src/gui/windows/charselectdialog.cpp:139
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:169
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:243
+#: src/gui/windows/charselectdialog.cpp:218
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:263
+#: src/gui/windows/charselectdialog.cpp:238
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5839,27 +5855,27 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/charselectdialog.cpp:301
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:474
+#: src/gui/windows/charselectdialog.cpp:449
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:483
+#: src/gui/windows/charselectdialog.cpp:458
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:485
+#: src/gui/windows/charselectdialog.cpp:460
 msgid "Enter password:"
 msgstr ""
 
@@ -6029,11 +6045,6 @@ msgstr ""
 msgid "Equip"
 msgstr "裝備"
 
-#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:218
-msgid "O"
-msgstr ""
-
 #. TRANSLATORS: inventory cart button
 #: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
@@ -6232,8 +6243,8 @@ msgstr ""
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:51
-#: src/gui/windows/registerdialog.cpp:60
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:62
 msgid "Register"
 msgstr "註冊"
 
@@ -6268,17 +6279,6 @@ msgstr ""
 msgid "Send"
 msgstr "傳送"
 
-#. TRANSLATORS: mail edit window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:122
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:124
-#: src/gui/windows/tradewindow.cpp:83
-msgid "Add"
-msgstr "增加"
-
 #. TRANSLATORS: mail edit window label
 #: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
@@ -6359,105 +6359,105 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:70
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:82
+#: src/gui/windows/ministatuswindow.cpp:80
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:85
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:102
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:107
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:113
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:136
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
-#: src/gui/windows/statuswindow.cpp:255
+#: src/gui/windows/ministatuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:234
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:359
-#: src/gui/windows/statuswindow.cpp:67 src/gui/windows/statuswindow.cpp:262
-#: src/gui/windows/statuswindow.cpp:387
+#: src/gui/windows/ministatuswindow.cpp:358
+#: src/gui/windows/statuswindow.cpp:66 src/gui/windows/statuswindow.cpp:241
+#: src/gui/windows/statuswindow.cpp:363
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:374
+#: src/gui/windows/ministatuswindow.cpp:411
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:398
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/npcdialog.cpp:78
 msgid "Next"
 msgstr "下一個"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Submit"
 msgstr "確認"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:124
+#: src/gui/windows/npcdialog.cpp:126
 msgid "Reset"
 msgstr "重設"
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:68
+#: src/gui/windows/npcselldialog.cpp:72
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:70
+#: src/gui/windows/npcselldialog.cpp:74
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -6489,40 +6489,40 @@ msgid "Switch character"
 msgstr "交換角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:78
+#: src/gui/windows/registerdialog.cpp:77
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:95
+#: src/gui/windows/registerdialog.cpp:94
 msgid "Male"
 msgstr "男生"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:97
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Female"
 msgstr "女生"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:118
+#: src/gui/windows/registerdialog.cpp:117
 msgid "Email:"
 msgstr "電子郵件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:186
+#: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:195
+#: src/gui/windows/registerdialog.cpp:197
 #, 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:204
+#: src/gui/windows/registerdialog.cpp:206
 #: src/gui/windows/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be at least %u characters long."
@@ -6530,17 +6530,28 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:213
+#: src/gui/windows/registerdialog.cpp:215
 #: src/gui/windows/unregisterdialog.cpp:135
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:221
+#: src/gui/windows/registerdialog.cpp:223
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
+#: src/net/eathena/loginrecv.cpp:107
+msgid "Incorrect email."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:236
+msgid "Email too long."
+msgstr ""
+
 #. TRANSLATORS: servers dialog name
 #: src/gui/windows/serverdialog.cpp:104
 msgid "Choose Your Server"
@@ -6604,7 +6615,7 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1078
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1086
 msgid "Personal Shop"
 msgstr ""
 
@@ -6635,49 +6646,60 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:960 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:968 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "要求交易"
 
-#: src/gui/windows/shopwindow.cpp:961
+#: src/gui/windows/shopwindow.cpp:969
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1083
+#: src/gui/windows/shopwindow.cpp:1091
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/skilldialog.cpp:90
 msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:192
+#: src/gui/windows/skilldialog.cpp:203
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:301
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:322
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
+#. TRANSLATORS: text skill dialog header
+#: src/gui/windows/skilldialog.cpp:765
+#, c-format
+msgid "Add text to skill %s"
+msgstr ""
+
+#. TRANSLATORS: text skill dialog field
+#: src/gui/windows/skilldialog.cpp:768
+msgid "Text: "
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/windows/socialwindow.cpp:68
 msgid "P"
@@ -6797,43 +6819,37 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:71
+#: src/gui/windows/statuswindow.cpp:70
 msgid "HP:"
 msgstr "體力 :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:73
 msgid "Exp:"
 msgstr "經驗值:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:134
 msgid "MP:"
 msgstr "魔力:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185 src/gui/windows/statuswindow.cpp:313
+#: src/gui/windows/statuswindow.cpp:171 src/gui/windows/statuswindow.cpp:292
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:187
+#: src/gui/windows/statuswindow.cpp:173
 msgid "Job:"
 msgstr "職業:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:359
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:338
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:374
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
-
 #. TRANSLATORS: command editor name
 #: src/gui/windows/textcommandeditor.cpp:47
 msgid "Command Editor"
@@ -6951,6 +6967,13 @@ msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能."
 
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/unregisterdialog.cpp:48
+#: src/gui/windows/unregisterdialog.cpp:53
+msgid "Unregister"
+msgstr "取消註冊"
+
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/unregisterdialog.cpp:64
 #, c-format
@@ -8186,12 +8209,12 @@ msgid "Clear drops window"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:313
+#: src/inventory.cpp:314
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:318
+#: src/inventory.cpp:319
 msgid "Npc"
 msgstr ""
 
@@ -8382,11 +8405,6 @@ msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:163 src/net/eathena/loginrecv.cpp:107
-msgid "Incorrect email."
-msgstr ""
-
-#. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
@@ -8759,66 +8777,91 @@ msgstr ""
 msgid "You have new mail from %s with subject %s"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:212
+#: src/net/eathena/skillrecv.cpp:216
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
-#: src/net/eathena/skillrecv.cpp:220
+#: src/net/eathena/skillrecv.cpp:224
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:228 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:232 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:236 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:240 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:244 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:248 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:252 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:256 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/eathena/skillrecv.cpp:273
+msgid "Fail summon."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:282
+#, c-format
+msgid "Need equipment %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:287
+#, c-format
+msgid "Need equipment %s and amount %d"
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:300
+#, c-format
+msgid "Need item %s."
+msgstr ""
+
+#: src/net/eathena/skillrecv.cpp:305
+#, c-format
+msgid "Need item %s and amount %d"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/traderecv.cpp:79
 #, c-format
@@ -8950,7 +8993,7 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
+#: src/resources/beinginfo.cpp:53 src/resources/db/avatardb.cpp:89
 #: src/resources/db/itemdb.cpp:382 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
@@ -9099,6 +9142,11 @@ msgstr ""
 msgid "pet"
 msgstr ""
 
+#. TRANSLATORS: unknown info name
+#: src/resources/db/skillunitdb.cpp:100
+msgid "skill"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
author	Andrei Karas <akaras@inbox.ru>	2015-11-21 14:57:00 +0300
committer	Andrei Karas <akaras@inbox.ru>	2015-11-21 14:57:00 +0300
commit	5ea9419d9628247504a6eaa164b6f1c6b271955b (patch)
tree	5b4cc922c5750ea614a07c4bc7b30a9fba63e01b
parent	f3511bcf5aac7a46958f9cdf1649be976679d257 (diff)
download	mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.gz mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.bz2 mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.tar.xz mv-5ea9419d9628247504a6eaa164b6f1c6b271955b.zip