Update translations.

39 files changed, 17904 insertions, 16604 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fa75f86dc..fb16d7820 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -136,13 +136,14 @@ src/net/ea/gui/partytab.cpp
 src/net/ea/loginhandler.cpp
 src/net/ea/network.cpp
 src/net/ea/playerhandler.cpp
-src/net/ea/skillhandler.cpp
 src/net/eathena/generalhandler.cpp
 src/net/eathena/loginhandler.cpp
 src/net/eathena/pethandler.cpp
+src/net/eathena/skillhandler.cpp
 src/net/ea/tradehandler.cpp
 src/net/tmwa/charserverhandler.cpp
 src/net/tmwa/generalhandler.cpp
+src/net/tmwa/skillhandler.cpp
 src/render/rendererslistsdl2.h
 src/render/rendererslistsdl.h
 src/resources/beinginfo.cpp
diff --git a/po/ar.po b/po/ar.po
index a892f4f0b..21ff58d32 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -411,8 +411,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -486,8 +486,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1197,8 +1197,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1472,20 +1472,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1509,7 +1509,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1524,8 +1524,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1533,40 +1533,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1584,9 +1584,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1595,7 +1595,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1606,7 +1606,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1619,7 +1619,7 @@ msgstr "شراء"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1629,26 +1629,26 @@ msgstr "بيع"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1656,52 +1656,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "تجريد من العتاد"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1711,20 +1750,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1733,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1741,69 +1780,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1813,79 +1852,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1933,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,7 +2000,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1971,41 +2010,41 @@ msgid "Use"
 msgstr "استخدام"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2013,155 +2052,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2169,7 +2208,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "إسقاط"
@@ -2177,49 +2216,49 @@ msgstr "إسقاط"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "قسم"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2516,7 +2555,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -5163,7 +5202,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5272,19 +5311,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "تجريد من العتاد"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6302,71 +6328,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 6f859f2d9..79b7fcc08 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,8 +1520,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2173,49 +2212,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index b4e8525ea..4564c77bc 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -483,8 +483,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr "Crear grup"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1506,7 +1506,7 @@ msgstr "Pes: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Intercanvi"
@@ -1521,8 +1521,8 @@ msgstr "Intercanvi"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1530,40 +1530,40 @@ msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1581,9 +1581,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Moure"
@@ -1592,7 +1592,7 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parlar"
@@ -1603,7 +1603,7 @@ msgstr "Parlar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,7 +1616,7 @@ msgstr "Comprar"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1626,26 +1626,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1653,52 +1653,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Des-equipar"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr "Element del mapa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1708,20 +1747,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1730,7 +1769,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1738,69 +1777,69 @@ msgstr "Conjunt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Conjurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr "Activa resaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr "Borrar nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr "Habilitar absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr "Des-habilita absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Deixa"
 
@@ -1810,79 +1849,79 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr "Nom:                     "
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -1891,64 +1930,64 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Botiga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -1958,7 +1997,7 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1968,41 +2007,41 @@ msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2010,155 +2049,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2166,7 +2205,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Deixar caure"
@@ -2174,49 +2213,49 @@ msgstr "Deixar caure"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2513,7 +2552,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Sortir"
 
@@ -5160,7 +5199,7 @@ msgid "Whispering to %s: %s"
 msgstr "Xiuxiuejant a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5269,19 +5308,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Des-equipar"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6291,71 +6317,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Agafa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr "Canvia el mode de recollir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Assentat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Activa/Desactiva Intercanvis"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr "Canviar mode de visionat de mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "Selecciona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 54b89ebad..ac22d0a25 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-27 09:27+0000\n"
+"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -39,131 +39,131 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d týdnů"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdnů"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dní"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d hodin"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d vteřinu"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Nelze možné zaslat prázdné šeptání!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
@@ -185,25 +185,25 @@ msgstr "Chybí jméno gildy."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Člověk"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "uskočení"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Byl jsi zabit %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -371,43 +371,43 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -417,8 +417,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -445,37 +445,37 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 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:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -491,42 +491,42 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -540,50 +540,50 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -623,416 +623,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Chyba sítě"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) neznámý pohyb"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) šílené pohyby číslo %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr "(4) pohyb k cíli do vzdálenosti 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr "(6) pohyb k cíli do vzdálenosti 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr "(8) pohyb k cíli do vzdálenosti 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr "(9) pohyb k cíli do vzdálenosti 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) dosah útoku lučštníka"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) jdi na útočnou vzdálenost -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) následování mazlíčka"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) útok"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr přes 2x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) útoč na všecky hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) útočit na všecky krom přátel"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) útoč na ty se špatnými vztahy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) neútočit na hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) útok hráče proti hráči"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Modifikátory hry nejsou známy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr "(e) prázdná mapa s kolizní vrstvou"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr "(E) prázdná mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr "(?) zobrazení mapy"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Pryč"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Preješ si otevřít stránku podpory?"
 
@@ -1203,8 +1203,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1455,7 +1455,7 @@ msgstr "Komentář: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
@@ -1478,36 +1478,36 @@ msgstr "Vytvořit partu"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
@@ -1515,7 +1515,7 @@ msgstr "Váha: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Obchod"
@@ -1531,42 +1531,42 @@ msgstr "Obchod"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Útok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
@@ -1591,8 +1591,8 @@ msgstr "Vyhladit"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jdi sem"
@@ -1612,9 +1612,9 @@ msgstr "Promluv"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1625,9 +1625,9 @@ msgstr "Nákup"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1635,8 +1635,8 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Přidat komentář"
 
@@ -1662,35 +1662,49 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Přejít k cíli"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
-msgstr ""
+msgstr "Oheň"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
+msgstr "Nakrmit"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Upustit vše"
+msgstr "Upustit kořist"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1702,53 +1716,52 @@ msgstr "Odebrat z vybavení"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter přepíná chat."
+msgstr "Vrátit k vejci"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Označit na mapě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1758,20 +1771,20 @@ msgstr "Přejmenovat"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
@@ -1780,77 +1793,77 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Opustit"
 
@@ -1860,79 +1873,79 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -1941,64 +1954,64 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2008,51 +2021,51 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2060,155 +2073,155 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitace"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
-msgstr ""
+msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2216,57 +2229,57 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Rozdělit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Vykopnout"
 
@@ -2301,7 +2314,7 @@ msgstr "Smajlíci"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2315,7 +2328,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Ostatní"
 
@@ -2538,8 +2551,8 @@ msgstr "Úroveň: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
@@ -2560,9 +2573,9 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Ukončit"
@@ -2573,10 +2586,10 @@ msgstr "Ukončit"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2586,10 +2599,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2598,16 +2611,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Vše"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
@@ -2615,64 +2628,64 @@ msgstr "Cena: %s / Celkem %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Upravit"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
-msgstr ""
+msgstr "Typ: %s"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
-msgstr ""
+msgstr "Neznámý"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
-msgstr ""
+msgstr "Země"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
-msgstr ""
+msgstr "Svůj"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
-msgstr ""
+msgstr "Nepoužitý"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
-msgstr ""
+msgstr "Podpůrný"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
-msgstr ""
+msgstr "Zamcílí past"
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
-msgstr ""
+msgstr "Neznámý:"
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
-msgstr ""
+msgstr "/ Mana: -%d"
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr "Dosah: %d"
@@ -2683,30 +2696,30 @@ msgid "Battle"
 msgstr "Boje"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s je nyní připojen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s se právě odpojil."
@@ -2951,7 +2964,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gilda"
 
@@ -3727,8 +3740,8 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Obchod"
 
@@ -3745,8 +3758,8 @@ msgstr "Zapnout mód obchodu"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -3848,7 +3861,7 @@ msgstr "Zapnout debug záznam"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:369
 msgid "Ignore logging packets"
-msgstr ""
+msgstr "Ignorovat pakety záznamu"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:373
@@ -4135,9 +4148,9 @@ msgstr "Povolit šeptání"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Smazat"
@@ -4668,7 +4681,7 @@ msgstr "Portály: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Parta"
 
@@ -4795,7 +4808,7 @@ msgstr "VYB"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -4806,7 +4819,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventář"
@@ -4822,7 +4835,7 @@ msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -4833,7 +4846,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Společenství"
 
@@ -4912,7 +4925,7 @@ msgstr "Ověřovač botů"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Resetovat"
 
@@ -4922,67 +4935,67 @@ msgid "Result"
 msgstr "Výsledek"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Vytvořit předměty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Počet:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Vytvořit"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Změnit e-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Zadej novou emailovou adresu dvakrát:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Nový email musí mít nejméně %u znaků."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Nový email musí mít méně než %u znaků."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Emailové adresy nesouhlasí."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -4990,36 +5003,36 @@ msgstr "Změnit heslo"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Heslo:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Zadej nové heslo dvakrát:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Nejdřív zadej původní heslo."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Nové heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Nové heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Nová hesla nesouhlasí."
 
@@ -5033,8 +5046,8 @@ msgstr "Nová postava"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -5081,14 +5094,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Žena"
 
@@ -5136,57 +5149,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Účet %s (poslední přihlášení %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Přepnout přihlášení"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Hrát"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Informace"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Změnit email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Účet %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr "Prosím nastavte nový pin kód"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5201,33 +5214,33 @@ msgstr ""
 "Zkušenost: %u\n"
 "Peníze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "mazlíček patřící %s"
@@ -5275,7 +5288,7 @@ msgstr "Upravit server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Připojit"
 
@@ -5315,14 +5328,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Prosím zadejte alespoň adresu a port serveru."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
-msgstr ""
+msgstr "Vyber vejce"
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Vybrat"
 
@@ -5344,7 +5357,7 @@ msgstr "Věděl jsi že..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5356,47 +5369,47 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -5511,137 +5524,137 @@ msgstr "Jack O se rodí"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Přihlášení"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Pamatovat uživatelské jméno"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Updaty:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Změnit server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrace"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Vlastní host updatů"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Host updatu: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Otevřít registrační url"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "pruh zdraví"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "pruh many"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "pruh zkušeností"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "pruh váhy"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "pruh míst v inventáři"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "pruh peněz"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "pruh šípů"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "stavový řádek"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "pruh práce"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Potřebuješ"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Prácovní úroveň: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Zastavit čekání"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -5650,34 +5663,34 @@ msgstr "Odeslat"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Přidat"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Komu:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. Odesílatel nebo dopis není platný."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "prodat předmět"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Opravdu chceš prodat %s?"
@@ -5699,106 +5712,106 @@ msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Přepnout server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Přepnout postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Potvrdit:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Jméno musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Jméno musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -5814,228 +5827,233 @@ msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Koupit věci"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Prodat věci"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Oznámit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Aukce"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Hrad gildy: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "H"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Název gildy"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do jeho party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "BŽ:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Zk:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MB:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Práce: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Práce:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodů postavy: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Opravné body: %d"
@@ -6106,58 +6124,58 @@ msgid "Save"
 msgstr "Uložit"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Potvrzeno. Čekám..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Odsouhlaseno. Čekám..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Obchod: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Změnit"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
@@ -6197,42 +6215,42 @@ msgid "Completed"
 msgstr "Hotovo"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Obnovit"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Kdo je přihlášený - Update"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Zvol svět"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Změň přihlášení"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Vyber svět"
 
@@ -6342,13 +6360,12 @@ msgstr "Zaměřit hráče"
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:132
 msgid "Target mercenary"
-msgstr ""
+msgstr "Zaměř žoldáka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Typ cíle:"
+msgstr "Zaměř mazlíčka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6421,6 +6438,12 @@ msgid "Return to safe video mode"
 msgstr "Návrat k bezpečnému video módu"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+#, fuzzy
+msgid "Fire your homunculus"
+msgstr "Zastřel svého žoldáka"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
@@ -6972,7 +6995,7 @@ msgstr "Uploadovat nastavení serveru"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:368
 msgid "Fire your mercenary"
-msgstr ""
+msgstr "Zastřel svého žoldáka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
@@ -7350,80 +7373,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Nemohu použít toto ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Neznámá chyba postavy na serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Nesprávné statistiky."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Nesprávný účes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Nesprávný místo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Špatná rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Špatný vzhled."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Nelze odeslat šeptání, %s není připojen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Nelze odeslat šeptání, %s vás ignoruje."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr "Šeptání nebylo možné zaslat, jsi ignorován všemi hráči."
 
@@ -7492,47 +7515,47 @@ msgstr "Hrad gildy: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Stav sdílení zkušeností neznámý."
 
@@ -7553,43 +7576,43 @@ msgstr "Nové heslo je příliš krátké."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Odmítnutí od serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Klientský software je příliš starý."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7599,22 +7622,22 @@ msgstr ""
 "Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Špatný e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
@@ -7651,265 +7674,225 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Obchod selhal!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Smajlík selhal!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Sednutí selhalo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Selhalo vytváření postavy!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Nemůžete vstoupit do party!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Nelze křičet!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Nedostatek životů (HP)!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Nedostatek bodů dovednosti (SP)!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Nemáte žádné zprávy!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Toto momentálně nemůžete udělat!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Vypadá to že potřebujete více peněz... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Potřebujete další rubín!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Potřebujete další safír!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Eh? Co to je?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Přesun selhal..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Neleze ukrást nic..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Jed nemá žádný účinek..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Síla %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Hbitost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalita %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Obratnost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Štěstí %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Detekován podvod s rychlostí."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Duplicitní přihlášení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Neznámá chyba připojení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Síla"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Hbitost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalita"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Inteligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Obratnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Štěstí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Obrana"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Magický útok"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Magická Obr."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Přesnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Uhnutí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritický zásah"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Zpoždění útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Zpoždění chůze"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Dosah útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Poškození za vteř."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Neznámá chyba."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Nedostatek životů (HP)!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Nedostatek bodů dovednosti (SP)!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Nemáte žádné zprávy!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Toto momentálně nemůžete udělat!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Vypadá to že potřebujete více peněz... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Potřebujete další rubín!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Potřebujete další safír!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Eh? Co to je?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7923,35 +7906,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s s tebou chce obchodovat, souhlasíš?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Síla:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Hbitost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitalita:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Štěstí:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Obchod selhal!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Smajlík selhal!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Sednutí selhalo!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Selhalo vytváření postavy!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Nemůžete vstoupit do party!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Nelze křičet!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Přesun selhal..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Neleze ukrást nic..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Jed nemá žádný účinek..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7992,85 +8020,85 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nepojmenovaný"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritický útok %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr "Magický útok %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritická obrana %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr "Magiská obrana %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "BM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Úroveň %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr "Rychlost %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr "Dosah %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr "Útěk %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
@@ -8428,42 +8456,53 @@ msgstr "Postava není on-line!"
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:327
 msgid "Pet catch failed."
-msgstr ""
+msgstr "Pokus o polapení mazíčka selhal."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:331
 msgid "Pet catched."
-msgstr ""
+msgstr "Mazlíček byl polapen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:335
 #, c-format
 msgid "Pet catch unkown error: %d."
-msgstr ""
+msgstr "Neznámá chyba polapení mazlíčka: %d."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:339
 msgid "Your mercenary duty hour is over."
-msgstr ""
+msgstr "Čas služby Tvého žoldáka vypršel."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:343
 msgid "Your mercenary was killed."
-msgstr ""
+msgstr "Tvůj žoldák byl zabit."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:347
 msgid "Your mercenary was fired."
-msgstr ""
+msgstr "Tvůj žoldák byl propuštěn."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:351
 msgid "Your mercenary run away."
-msgstr ""
+msgstr "Tvůj žoldák zběhl."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:355
 msgid "Mercenary unknown state."
+msgstr "Status žoldáka neznámý."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
diff --git a/po/de.po b/po/de.po
index b202ffb03..efb84c9d0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -41,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -54,131 +54,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d Wochen"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d Tage"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d Stunden"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d Minuten"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d Sekunden"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Ausgabe der Umgebungsvariablen"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -189,7 +189,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Name der Gruppe fehlt."
 
@@ -200,25 +200,25 @@ msgstr "Name der Gilde fehlt."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
@@ -306,77 +306,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -385,43 +385,43 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "Erfahrungspunkte"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -431,8 +431,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignoriere komplett"
 
@@ -459,37 +459,37 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -505,42 +505,42 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
@@ -554,50 +554,50 @@ msgstr "Charakterserver wechseln"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
@@ -638,416 +638,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) Bewegungen umkehren"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegt sich etwas verrückt"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegt sich verrückt"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) normal + verrückt Bewegen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) unbekannte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) verrückte Bewegung Nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) bewegt sich normal zum Ziel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(0) bewegt sich zum Ziel in Distanz 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegt sich zum Ziel in Distanz 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegt sich zum Ziel in Distanz 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegt sich zum Ziel in Distanz 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegt sich zum Ziel in Distanz 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) bewegt sich zum Ziel in Reichweite"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) Bogenschützen Angriffsreichweite"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) bewegt sich zum Ziel in Angriffsreichweite - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) bewegt sich zu jedem Ziel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) normales Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) relatives Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeltes Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) hinterher Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) unbekannter Folge-Modus"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) wechsel das Angriffslayout ohne Schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) wechsel das Angriffslayout mit Schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 2x3 Kästchen nach vorne aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 Kästchen aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) bis Distanz 4 gehen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) bis Distanz 8 gehen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) bis zur maximalen Distanz aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) greife alle Spieler an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) greife alle Spieler, außer Freunde, an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) greife schlechte Beziehungen an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) greife keine Spieler an"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) PVP Angriff"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) Ausrüstungsimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Spielmodifikatoren unbekannt"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Abwesend"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) spielerverfolgende Kamera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) freie Kamera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1218,8 +1218,8 @@ msgstr "Riesig (18)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(normal)"
 
@@ -1470,7 +1470,7 @@ msgstr "Kommentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
@@ -1493,36 +1493,36 @@ msgstr "Gruppe erstellen"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1530,7 +1530,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handeln"
@@ -1546,42 +1546,42 @@ msgstr "Handeln"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Angriff"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
@@ -1606,8 +1606,8 @@ msgstr "Atombombe"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Bewegen"
@@ -1627,9 +1627,9 @@ msgstr "Sprechen"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1640,9 +1640,9 @@ msgstr "Kaufen"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1650,8 +1650,8 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -1677,35 +1677,49 @@ msgstr "Hinzufügen zur normalen Angriffsliste"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Gehe zu Ziel"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Alles fallenlassen"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1717,53 +1731,52 @@ msgstr "Ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1773,20 +1786,20 @@ msgstr "Umbenennen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Warp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Bewege Kamera"
 
@@ -1795,77 +1808,77 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Leere Ausrüstungsfenster"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Lösche den Namen nicht"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Lösche Name"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1875,79 +1888,79 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Name:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Alles zum Handel hinzufügen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -1956,64 +1969,64 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Alles ablegen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Alles aufnehmen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2023,51 +2036,51 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Fächer des Wegwerffensters leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Verstecken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Zeigen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Nach oben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Nach unten"
 
@@ -2075,155 +2088,155 @@ msgstr "Nach unten"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Kaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Verkaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Lade zu Gruppe ein"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Zeige Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
@@ -2231,57 +2244,57 @@ msgstr "Alles fallenlassen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Aufteilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Rauswerfen"
 
@@ -2316,7 +2329,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2330,7 +2343,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Sonstig"
 
@@ -2553,8 +2566,8 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
@@ -2575,9 +2588,9 @@ msgstr "URL öffnen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Beenden"
@@ -2588,10 +2601,10 @@ msgstr "Beenden"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2601,10 +2614,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2613,16 +2626,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
@@ -2630,64 +2643,64 @@ msgstr "Preis: %s / Gesamt: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Ändern"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2698,30 +2711,30 @@ msgid "Battle"
 msgstr "Kampf"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -2966,7 +2979,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gilde"
 
@@ -3742,8 +3755,8 @@ msgstr "Aktiviere Gewichtsbenachrichtigungen"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Laden"
 
@@ -3760,8 +3773,8 @@ msgstr "Laden-Modus einschalten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4143,9 +4156,9 @@ msgstr "Flüstern erlauben"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Löschen"
@@ -4681,7 +4694,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Gruppe"
 
@@ -4808,7 +4821,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -4819,7 +4832,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventar"
@@ -4835,7 +4848,7 @@ msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -4846,7 +4859,7 @@ msgstr "SOZ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Sozial"
 
@@ -4925,7 +4938,7 @@ msgstr "Bot-Prüfer"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -4935,67 +4948,67 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Menge:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Erstellen"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Email-Adresse ändern"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Account: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Gib die neue E-Mailadresse zweimal ein:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Die neue Emailaddresse muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Die neue Emailaddresse darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -5003,36 +5016,36 @@ msgstr "Passwort ändern"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Passwort:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Gib dein neues Passwort zweimal ein:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Gib das alte Passwort zuerst an."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Das neue Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Das neue Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Die Passwörter stimmen nicht überein."
 
@@ -5046,8 +5059,8 @@ msgstr "Neuer Charakter"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Name :"
 
@@ -5094,14 +5107,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Männlich"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Weiblich"
 
@@ -5149,57 +5162,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Login wechseln"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Los!"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Abmelden"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5209,33 +5222,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5283,7 +5296,7 @@ msgstr "Bearbeite Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Verbinde..."
 
@@ -5323,14 +5336,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Auswahl"
 
@@ -5352,7 +5365,7 @@ msgstr "Wusstest Du schon..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5364,47 +5377,47 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände Du aufbewahren möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände Du abholen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Füge zu Einkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Füge zu Verkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -5517,137 +5530,137 @@ msgstr "JackO erscheint"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Benutzername merken"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Updateserver verwalten"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Update host: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Öffne die Registrierungs-URL"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Gesundheits Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Mana Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Erfahrungs Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "Gewichts Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "Inventarplatz Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "Geld Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "Pfeile Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "Status Balken"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "Job Balken"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Muss"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Stoppe Warten"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Absenden"
 
@@ -5656,34 +5669,34 @@ msgstr "Absenden"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Nach:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Senden"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang, den Brief zu senden oder er war ungültig."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "Verkaufe Gegenstand"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5705,106 +5718,106 @@ msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Server wechseln"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-Mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Der Benutzername muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Der Benutzername darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Das Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Das Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Warte auf den Server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -5820,229 +5833,234 @@ msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Persönlicher Laden"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Kaufe Dinge"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Verkaufe Dinge"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Teile mit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Zeige Links in Ankündigung"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Erhöhen"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeiten Tab %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Gildenburg: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Gildenname"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Charakterpunkte: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korrekturpunkte: %d"
@@ -6113,60 +6131,60 @@ msgid "Save"
 msgstr "Speichern"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Handel: Du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Ändern"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
@@ -6206,42 +6224,42 @@ msgid "Completed"
 msgstr "Fertig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online - Aktualisiere"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Aktualisierung"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Wer ist Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Welt wählen"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Login ändern"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Wähle Welt"
 
@@ -6355,9 +6373,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Art des Ziels:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6430,6 +6447,11 @@ msgid "Return to safe video mode"
 msgstr "Zum sicheren Videomodus zurücksetzen"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
@@ -7360,81 +7382,81 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Deaktiviert OpenGL für diese Sitzung"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht verwenden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Unbekannter Charakterserver Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wurde der Name "
 "schon genommen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Falscher Name."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Falsche Stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Falsche Haare."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Falscher Slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Falsche Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Charakter gelöscht."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Konnte nicht flüstern. Ignoriert von %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7503,47 +7525,47 @@ msgstr "Gildenburg: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Item-Sharing aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Item-Sharing deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Item-Sharing ist nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Item-Sharing unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Erfahrung teilen ist aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Erfahrung teilen ist deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Erfahrung teilen nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Erfahrung teilen unbekannt."
 
@@ -7564,43 +7586,43 @@ msgstr "Das neue Passwort ist zu kurz."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Unbekannte ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Vom Server abgelehnt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du wurdest für immer gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Client zu alt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7610,22 +7632,22 @@ msgstr ""
 "Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Server ist voll."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Dieser Benutzername ist bereits in Verwendung."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Falsche E-Mail-Adresse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Benutzername für immer gelöscht."
 
@@ -7664,265 +7686,225 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Du trägst weniger als die Hälfte des Gewichts. Du kannst dich regenerieren."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Handeln fehlgeschlagen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Gefühl fehlgeschlagen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Sitzen fehlgeschlagen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Chat starten fehlgeschlagen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Konnte Gruppe nicht beitreten!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Du kannst nicht schreien!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Du hast noch ein zu niedriges Level!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Unzureichende HP!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Unzureichende SP!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Du hast keine Erinnerungen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Das kannst du im Moment nicht machen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Du brauchst ein weiteres rotes Juwel!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Du brauchst ein weiteres blaues Juwel!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Huh? Was ist das?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Warp fehlgeschlagen..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Konnte nichts stehlen..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Gift hatte kein Effekt..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Authentifizierung verweigert."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Stärke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Gesundheit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Geschicklichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Glück"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Angriffsverzögerung"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Lauf-Verzögerung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Angriffsreichweite"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Unbekannter Fehler."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Du hast noch ein zu niedriges Level!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Unzureichende HP!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Unzureichende SP!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Du hast keine Erinnerungen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Das kannst du im Moment nicht machen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Du brauchst ein weiteres rotes Juwel!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Du brauchst ein weiteres blaues Juwel!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Huh? Was ist das?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7936,35 +7918,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Stärke:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Beweglichkeit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Gesundheit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Glück:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Handeln fehlgeschlagen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Gefühl fehlgeschlagen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Sitzen fehlgeschlagen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Chat starten fehlgeschlagen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Konnte Gruppe nicht beitreten!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Du kannst nicht schreien!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Warp fehlgeschlagen..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Konnte nichts stehlen..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Gift hatte kein Effekt..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -8005,85 +8032,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unbenannt"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -8483,6 +8510,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/en_GB.po b/po/en_GB.po
index 12a601550..cc40600d8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -483,8 +483,8 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1521,8 +1521,8 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1530,40 +1530,40 @@ msgstr "Attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1581,9 +1581,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1592,7 +1592,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Talk"
@@ -1603,7 +1603,7 @@ msgstr "Talk"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,7 +1616,7 @@ msgstr "Buy"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1626,26 +1626,26 @@ msgstr "Sell"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1653,52 +1653,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Unequip"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Players"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1708,20 +1747,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1730,7 +1769,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1738,69 +1777,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1810,79 +1849,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1891,64 +1930,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Store"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retrieve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1958,7 +1997,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1968,41 +2007,41 @@ msgid "Use"
 msgstr "Use"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2010,155 +2049,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2166,7 +2205,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Drop"
@@ -2174,49 +2213,49 @@ msgstr "Drop"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Split"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2513,7 +2552,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Exit"
 
@@ -5160,7 +5199,7 @@ msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5269,19 +5308,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Unequip"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6291,71 +6317,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Pick up"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Sit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "Select OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 0670a15ae..442e07817 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -483,8 +483,8 @@ msgstr "Helpo"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr "Krei partion"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1521,8 +1521,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1530,40 +1530,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr "Sanigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1581,9 +1581,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Movi"
@@ -1592,7 +1592,7 @@ msgstr "Movi"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Paroli"
@@ -1603,7 +1603,7 @@ msgstr "Paroli"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,7 +1616,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1626,26 +1626,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1653,52 +1653,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Ludantoj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1708,20 +1747,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1730,7 +1769,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1738,69 +1777,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Forlasi"
 
@@ -1810,79 +1849,79 @@ msgstr "Forlasi"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr "Nomo:                    "
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1891,64 +1930,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1958,7 +1997,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1968,41 +2007,41 @@ msgid "Use"
 msgstr "Uzi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2010,155 +2049,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr "Forigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr "Malignori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr "Imitado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2166,7 +2205,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2174,49 +2213,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2513,7 +2552,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Eliri"
 
@@ -5160,7 +5199,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5269,19 +5308,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6291,71 +6317,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 0a791b8db..0fca267c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -44,131 +44,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d días"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "¡No se pueden enviar susurros vacíos!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -179,7 +179,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
@@ -190,25 +190,25 @@ msgstr "Falta el nombre del gremio."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
@@ -296,77 +296,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,43 +375,43 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -421,8 +421,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -449,37 +449,37 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 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:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -495,42 +495,42 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -544,50 +544,50 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -627,416 +627,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 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:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Error de Red"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) moverse por defecto"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) moverse de forma invertida"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimiento loco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) movimiento loco personalizado"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) movimiento loco"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse  al objetivo en distancia 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) moverse al objetivo en el rango de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(b) moverse al blanco en rango de ataque - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) moverse al objetivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) seguir como mascota"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) ataque por defecto"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) intercambiar ataque con escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger hacia adelante a 2x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger hasta 3x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) atacar a todos, excepto a amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) no atacar a los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de vestimenta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) vista de depuración del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) vista extremista del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) vista extremista 2 del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) afuera"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Lejos del Teclado"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
@@ -1207,8 +1207,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1459,7 +1459,7 @@ msgstr "Comentario: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Crear grupo"
 
@@ -1482,36 +1482,36 @@ msgstr "Crear grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1519,7 +1519,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Intercambio"
@@ -1535,42 +1535,42 @@ msgstr "Intercambio"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
@@ -1595,8 +1595,8 @@ msgstr "Eliminar"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1616,9 +1616,9 @@ msgstr "Hablar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1629,9 +1629,9 @@ msgstr "Comprar"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Vender"
 
@@ -1639,8 +1639,8 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Agregar comentario"
 
@@ -1666,35 +1666,49 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Moverse al objetivo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Tirar todo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1706,53 +1720,52 @@ msgstr "Quitárselo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Volver a alternar el chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -1762,20 +1775,20 @@ msgstr "Renombrar"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Deformar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -1784,77 +1797,77 @@ msgstr "Mover cámara"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1864,79 +1877,79 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -1945,64 +1958,64 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2012,51 +2025,51 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Limpiar ventana de lanzamiento"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2064,155 +2077,155 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitación"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2220,57 +2233,57 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Expulsar"
 
@@ -2305,7 +2318,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2319,7 +2332,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Otro"
 
@@ -2542,8 +2555,8 @@ msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
@@ -2564,9 +2577,9 @@ msgstr "Abrir url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Salir"
@@ -2577,10 +2590,10 @@ msgstr "Salir"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2590,10 +2603,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2602,16 +2615,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Máx"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
@@ -2619,64 +2632,64 @@ msgstr "Precio: %s / Total: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2687,30 +2700,30 @@ msgid "Battle"
 msgstr "Batalla"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Anuncio global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anuncio global de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -2955,7 +2968,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gremio"
 
@@ -3732,8 +3745,8 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Tienda"
 
@@ -3750,8 +3763,8 @@ msgstr "Habilitar la tienda"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4140,9 +4153,9 @@ msgstr "Permitir mensajes privados"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Borrar"
@@ -4675,7 +4688,7 @@ msgstr "Portales: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grupo"
 
@@ -4802,7 +4815,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -4813,7 +4826,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventario"
@@ -4829,7 +4842,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4840,7 +4853,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Social"
 
@@ -4919,7 +4932,7 @@ msgstr "Inspector de Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -4929,46 +4942,46 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Crear artículos"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Cantidad:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Crear"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Cambiar Dirección de Correo electrónico"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Cuenta: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Escribe el nuevo correo dos veces:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
@@ -4976,7 +4989,7 @@ msgstr ""
 "largitud."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
@@ -4984,16 +4997,16 @@ msgstr ""
 "longitud."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Las direcciones de correo suministradas no concuerdan."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
@@ -5001,36 +5014,36 @@ msgstr "Cambiar contraseña"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Contraseña:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Escribe dos veces la nueva contraseña:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Primero ingresa la contraseña antigua."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "La nueva contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "La nueva contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Las contraseñas nuevas ingresadas no concuerdan."
 
@@ -5044,8 +5057,8 @@ msgstr "Nuevo Personaje"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -5092,14 +5105,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Masculino"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Femenino"
 
@@ -5147,57 +5160,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "¿Estás seguro de que deseas borrar este personaje?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Cuenta %s (fecha de último inicio %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Volver al Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jugar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Información"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Cambiar correo"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Cuenta %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5212,33 +5225,33 @@ msgstr ""
 "Experiencia: %u\n"
 "Dinero: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -5286,7 +5299,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5327,14 +5340,14 @@ msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Select"
 
@@ -5356,7 +5369,7 @@ msgstr "¿Sabías que..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5368,47 +5381,47 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Selecciona la cantidad de artículos a intercambiar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de artículos a tirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de artículos."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Agregar tienda (compra)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Agregar a la tienda (venta)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -5521,137 +5534,137 @@ msgstr "jacko apareciendo"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Actualizar:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Host de actualización: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Abrir registro de url"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "barra de salud"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "barra de maná"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "barra de peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "barra de ranuras del inventario"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "barra de dinero"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "barra de estado"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "barra de trabajo"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Necesitas"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5660,34 +5673,34 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Añadir"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "vender artículo"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "¿Realmente quieres vender %s?"
@@ -5709,34 +5722,34 @@ msgid "Away outfit"
 msgstr "Vestimenta AFK"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Correo:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 "El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
@@ -5744,73 +5757,73 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "La contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Usar la misma ip para los subservidores del juego"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descargando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "requiere una versión más nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -5826,228 +5839,233 @@ msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Comprar artículos"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Vender artículos"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Anunciar"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en el anuncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Subasta"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Castillo del gremio: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando gremio llamado %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nombre del Gremio"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu gremio."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del gremio, pero ya existe uno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado a unirte al gremio %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al gremio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe uno."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Has sido invitado a unirte un grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear el grupo; ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "PV:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Trabajo:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
@@ -6118,60 +6136,60 @@ msgid "Save"
 msgstr "Guardar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Proponer el intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Esperando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Aceptar intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Aceptado. Esperando..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Cambiar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
@@ -6211,42 +6229,42 @@ msgid "Completed"
 msgstr "Completado"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Actualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Quién está conectado - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Quién está conectado - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Quién está conectado - Actualizar"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Seleccionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Cambiar de Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escoger Mundo"
 
@@ -6360,9 +6378,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Tipo de objetivo:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6435,6 +6452,11 @@ msgid "Return to safe video mode"
 msgstr "Volver a modo de video seguro"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Activar el chat"
@@ -7364,80 +7386,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
 "servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Imposible usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Falla char-server desconocida."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Estadísticas incorrectas."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Cabello incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Raza incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Apariencia incorrecta."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7506,47 +7528,47 @@ msgstr "Castillo del gremio: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "No se puede compartir artículos."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "No se puede compartir experiencia."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
@@ -7567,32 +7589,32 @@ msgstr "Nueva contraseña es muy corta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Error desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7600,12 +7622,12 @@ msgstr ""
 "equipo de GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7615,22 +7637,22 @@ msgstr ""
 "Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "E-mail incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
@@ -7669,265 +7691,225 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "¡Fallo al intercambiar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "¡Fallo al hacer un emoticono!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "¡Fallo al sentarse!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "¡Fallo al crear un chat!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "¡No se puede unir al grupo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "¡Imposible gritar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "¡PV insuficientes!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "¡SP insuficiente!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "¡No tienes ningún memo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "¡No puedes hacer esto ahora mismo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que necesitas más dinero... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "¡Necesitas otra gema roja!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "¡Necesitas otra gema azul!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "¡Estás llevando muchas cosas para hacer esto!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "¿Uh? ¿Qué es eso?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Salto fallido..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "No puedes robar nada..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Veneno no tuvo ningún efecto..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Fuerza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencia %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Suerte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Fuerza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agilidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Inteligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Suerte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Retraso de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Retraso de Marcha"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Rango de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Error desconocido."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "¡PV insuficientes!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "¡SP insuficiente!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "¡No tienes ningún memo!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "¡No puedes hacer esto ahora mismo!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que necesitas más dinero... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "¡Necesitas otra gema roja!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "¡Necesitas otra gema azul!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "¡Estás llevando muchas cosas para hacer esto!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "¿Uh? ¿Qué es eso?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7941,35 +7923,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quiere realizar un intercambio contigo, ¿aceptas?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Fuerza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agilidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Suerte:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "¡Fallo al intercambiar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "¡Fallo al hacer un emoticono!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "¡Fallo al sentarse!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "¡Fallo al crear un chat!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "¡No se puede unir al grupo!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "¡Imposible gritar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Salto fallido..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "No puedes robar nada..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Veneno no tuvo ningún efecto..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -8010,85 +8037,85 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Nivel %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -8484,6 +8511,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/et.po b/po/et.po
index b99331fc6..5579721ca 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr "Abi"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,8 +1520,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2173,49 +2212,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index fb84ea0d3..031aa0722 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,8 +1519,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2172,49 +2211,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "خروج"
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6287,71 +6313,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index e4ebba4db..7939d41ba 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -34,131 +34,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d viikkoa"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d päivää"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d tuntia"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minuuttia"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d sekuntia"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -169,7 +169,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
@@ -180,25 +180,25 @@ msgstr "Killan nimi puuttuu."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
@@ -286,77 +286,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "-"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,43 +365,43 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -411,8 +411,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -439,37 +439,37 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -485,42 +485,42 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -534,50 +534,50 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -617,416 +617,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) poissa"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Poissa"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1197,8 +1197,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1449,7 +1449,7 @@ msgstr "Kommentti: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
@@ -1472,36 +1472,36 @@ msgstr "Luo ryhmä"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Peru"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
@@ -1509,7 +1509,7 @@ msgstr "Paino: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tee kaupat"
@@ -1525,42 +1525,42 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Hyökkää"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
@@ -1585,8 +1585,8 @@ msgstr "Pommita"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Liiku"
@@ -1606,9 +1606,9 @@ msgstr "Keskustele"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Osta"
 
@@ -1619,9 +1619,9 @@ msgstr "Osta"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Myy"
 
@@ -1629,8 +1629,8 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
@@ -1656,35 +1656,49 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Mene kohteen luo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Pudota kaikki"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1696,53 +1710,52 @@ msgstr "Poista varuste käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Karttaolio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1752,20 +1765,20 @@ msgstr "Nimeä uudelleen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1774,77 +1787,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1854,79 +1867,79 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -1935,64 +1948,64 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2002,51 +2015,51 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2054,155 +2067,155 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Matki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2210,57 +2223,57 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Jaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Potki"
 
@@ -2295,7 +2308,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -2309,7 +2322,7 @@ msgstr "Keskustelu"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Muu"
 
@@ -2532,8 +2545,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
@@ -2554,9 +2567,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Sulje"
@@ -2567,10 +2580,10 @@ msgstr "Sulje"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2580,10 +2593,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2592,16 +2605,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -2609,64 +2622,64 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Muokkaa"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2677,30 +2690,30 @@ msgid "Battle"
 msgstr "Taistelu"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Yleinen ilmoitus:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s ilmoittaa kaikille:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2945,7 +2958,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Kilta"
 
@@ -3721,8 +3734,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -3739,8 +3752,8 @@ msgstr "Ota kauppatila käyttöön"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -4122,9 +4135,9 @@ msgstr "Salli kuiskaukset"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Poista"
@@ -4653,7 +4666,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Ryhmä"
 
@@ -4780,7 +4793,7 @@ msgstr "Var"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -4791,7 +4804,7 @@ msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Tavarat"
@@ -4807,7 +4820,7 @@ msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Taidot"
 
@@ -4818,7 +4831,7 @@ msgstr "Sos"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Suhteet"
 
@@ -4897,7 +4910,7 @@ msgstr "Bottitutka"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -4907,67 +4920,67 @@ msgid "Result"
 msgstr "Tulos"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Määrä:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Luo"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Vaihda sähköpostiosoite"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Tili: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Kirjoita uusi sähköpostiosoite kahdesti:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
@@ -4975,36 +4988,36 @@ msgstr "Vaihda salasana"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Salasana:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Kirjoita uusi salasana kahdesti:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Anna ensin vanha salasana."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Uuden salasanan kopiot eivät täsmää."
 
@@ -5018,8 +5031,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -5066,14 +5079,14 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Miespuolinen"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Naispuolinen"
 
@@ -5121,57 +5134,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Vaihda sisäänkirjautumistietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Pelaa"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Tietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5181,33 +5194,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Salasana:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5255,7 +5268,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -5295,14 +5308,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5324,7 +5337,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5336,47 +5349,47 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -5489,137 +5502,137 @@ msgstr "jacko elää!"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Päivitys:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Palvelin:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "terveyspalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "manapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "kokemuspalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "painopalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "tavarapaikkapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "rahapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "nuolipalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "tilapalkki"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "työpalkki"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Tarvitaan"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Lähetä"
 
@@ -5628,34 +5641,34 @@ msgstr "Lähetä"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Lisää"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Vastaanottaja:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5677,106 +5690,106 @@ msgid "Away outfit"
 msgstr "Poissaoloasu"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Vahvista:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -5792,228 +5805,233 @@ msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Osta tavaroita"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Myy tavaroita"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Ilmoita"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Killan linna: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Killan nimi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "VP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Kok:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Työ:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
@@ -6084,58 +6102,58 @@ msgid "Save"
 msgstr "Tallenna"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Muuta"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
@@ -6175,42 +6193,42 @@ msgid "Completed"
 msgstr "Valmis"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Päivitä"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Valitse pelimaailma"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Vaihda kirjautumistietoja"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
@@ -6324,9 +6342,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Kohdetyyppi:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6399,6 +6416,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
@@ -7326,78 +7348,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Tätä tunnistetta ei voi käyttää."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Tuntematon hahmopalvelinvirhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Väärät arvot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Väärä hiustyyli."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Väärä rotu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7466,47 +7488,47 @@ msgstr "Killan linna: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Kokemuksen jaon tila on tuntematon."
 
@@ -7527,44 +7549,44 @@ msgstr "Uusi salasana on liian lyhyt."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7574,22 +7596,22 @@ msgstr ""
 "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
@@ -7625,265 +7647,225 @@ msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta.
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Kauppa epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Elehtiminen epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Istuminen epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Keskustelun luonti epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Ryhmään liittyminen epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Huutaminen epäonnistui!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Et ole vielä riittävän korkealla tasolla!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Voimapisteesi eivät riitä!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Manapisteesi eivät riitä!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Sinulla ei ole muistioita (memo)!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Et voi tehdä tätä juuri nyt!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Tarvitset toisen punaisen helmen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Tarvitset toisen sinisen helmen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Kannat liian paljon tehdäksesi tällaista!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Siis mikä?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Siirtymä (warp) epäonnistui..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Varastaminen ei onnistunut..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Myrkyllä ei ollut vaikutusta..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Voima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Ketteryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Elinvoima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Älykkyys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Näppäryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Tuuri"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Tuntematon virhe."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Et ole vielä riittävän korkealla tasolla!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Voimapisteesi eivät riitä!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Manapisteesi eivät riitä!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Sinulla ei ole muistioita (memo)!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Et voi tehdä tätä juuri nyt!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Tarvitset toisen punaisen helmen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Tarvitset toisen sinisen helmen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Kannat liian paljon tehdäksesi tällaista!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Siis mikä?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7897,35 +7879,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Voima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Ketteryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Tuuri:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Kauppa epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Elehtiminen epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Istuminen epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Keskustelun luonti epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Ryhmään liittyminen epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Huutaminen epäonnistui!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Siirtymä (warp) epäonnistui..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Varastaminen ei onnistunut..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Myrkyllä ei ollut vaikutusta..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7966,85 +7993,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -8441,6 +8468,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 36d06aded..d0ea8cde1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -44,131 +44,131 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d semaines"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d semaines"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d jours"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d jours"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d heures"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d heures"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minutes"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d secondes"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages privés vides !"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -179,7 +179,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
@@ -190,26 +190,26 @@ msgstr "Le nom de la guilde est manquant."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "La touche <Entrée> ferme la ligne d'entrée de la conversation."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
@@ -297,77 +297,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Humain"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Vous avez été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "L'inventaire est plein."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "La pile est trop grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -376,43 +376,43 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -422,8 +422,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -450,37 +450,37 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 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:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -496,42 +496,42 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -545,50 +545,50 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -629,417 +629,417 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 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:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnu"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) mouvement fou numéro %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible distante de 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller à la cible jusqu'à 2 de distance"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible distante de 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr "(4) se déplacer à la cible à distance 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible distante de 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr "(6) se déplacer à la cible à distance 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible distante de 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr "(8) se déplacer à la cible à distance 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr "(9) se déplacer à la cible à distance 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) Portée de l'attaque des archers"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) aller jusqu'à cible à portée - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) aller à la cible"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) suivre : mode inconnu"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) attaque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans bouclier"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec bouclier"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) ramassage"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) sorts d'attaque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) attaquer tous les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) attaquer tous, sauf les amis"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr "(e) vider la vue de la carte avec des collisions"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr "(E) vider la vue de la carte"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr "(?) vue de la carte"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) Absent"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) absent"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Inactif"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
@@ -1210,8 +1210,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1462,7 +1462,7 @@ msgstr "Commentaire : %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Créer un groupe"
 
@@ -1485,36 +1485,36 @@ msgstr "Créer un groupe"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
@@ -1522,7 +1522,7 @@ msgstr "Poids : %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Échange"
@@ -1538,42 +1538,42 @@ msgstr "Échange"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Attaquer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
@@ -1598,8 +1598,8 @@ msgstr "Annihiler"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Déplacement"
@@ -1619,9 +1619,9 @@ msgstr "Parler"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1632,9 +1632,9 @@ msgstr "Acheter"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1642,8 +1642,8 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
@@ -1669,35 +1669,49 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Aller à la cible"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Jeter tout"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1709,53 +1723,52 @@ msgstr "Retirer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "La touche <Entrée> ferme la ligne d'entrée de la conversation."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Objet de carte"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1765,20 +1778,20 @@ msgstr "Renommer"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -1787,77 +1800,77 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1867,79 +1880,79 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nom :                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -1948,64 +1961,64 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2015,51 +2028,51 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2067,155 +2080,155 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Jeter..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Jeter tout"
 
@@ -2223,57 +2236,57 @@ msgstr "Jeter tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Jeter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Partager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Virer"
 
@@ -2308,7 +2321,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Conversation"
 
@@ -2322,7 +2335,7 @@ msgstr "Conversation"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Autre"
 
@@ -2545,8 +2558,8 @@ msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
@@ -2567,9 +2580,9 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Quitter"
@@ -2580,10 +2593,10 @@ msgstr "Quitter"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2593,10 +2606,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2605,16 +2618,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Max."
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
@@ -2622,64 +2635,64 @@ msgstr "Prix : %s / Total : %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Éditer"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr "Portée : %d"
@@ -2690,30 +2703,30 @@ msgid "Battle"
 msgstr "Combat"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Annonce globale :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "Message privé de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -2958,7 +2971,7 @@ msgstr "MJ"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guilde"
 
@@ -3736,8 +3749,8 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Boutique"
 
@@ -3754,8 +3767,8 @@ msgstr "Activer le mode boutique"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "PNJ"
 
@@ -4146,9 +4159,9 @@ msgstr "Autoriser les messages privés"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Supprimer"
@@ -4684,7 +4697,7 @@ msgstr "Portails : %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Groupe"
 
@@ -4811,7 +4824,7 @@ msgstr "Equ"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -4822,7 +4835,7 @@ msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventaire"
@@ -4838,7 +4851,7 @@ msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Compétences"
 
@@ -4849,7 +4862,7 @@ msgstr "Soc"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Social"
 
@@ -4928,7 +4941,7 @@ msgstr "Testeur de Robot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -4938,67 +4951,67 @@ msgid "Result"
 msgstr "Résultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Créer des objets"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Montant :"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Créer"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Modifier l'adresse e-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Compte : %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Entrer l'adresse e-mail deux fois :"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "La nouvelle adresse email doit être longue d'au moins %u caractères."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "La nouvelle adresse email doit être longue d'au plus %u caractères."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Les deux adresses e-mail ne correspondent pas."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -5006,36 +5019,36 @@ msgstr "Changer le mot de passe"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Mot de passe :"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Entrer le mot de passe deux fois :"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Entre d'abord l'ancien mot de passe."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Le nouveau mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Le nouveau mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
@@ -5049,8 +5062,8 @@ msgstr "Nouveau Personnage"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nom :"
 
@@ -5097,14 +5110,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Masculin"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Féminin"
 
@@ -5152,57 +5165,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Etes-vous certain de vouloir supprimer ce personnage ?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Compte %s (dernier ouverture le %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Changer de compte"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Informations"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Se désinscrire"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr "Définis le nouveau code pin"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5217,33 +5230,33 @@ msgstr ""
 "Expérience : %u\n"
 "Argent : %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Entre le mot de passe pour effacer le personnage"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -5291,7 +5304,7 @@ msgstr "Éditer le Serveur"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -5331,14 +5344,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Entre au moins l'adresse et le port du serveur."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -5360,7 +5373,7 @@ msgstr "Savais-tu que..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5372,47 +5385,47 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à jeter."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -5525,137 +5538,137 @@ msgstr "Arrivée de Jack0"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Compte"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Mise à jour :"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "S'inscrire"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Serveur :"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Hôte de mise à jour : %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Ouvrir l'URL d'inscription"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barre de vie"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barre de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Barre d'expérience"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "Barre de poids"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "Barre emplacements d'inventaire"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "Barre d'argent"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "Barre de flèches"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "Barre de statut"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "Barre de compétences"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (MJ %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Restant"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -5664,34 +5677,34 @@ msgstr "Soumettre"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Vers :"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Envoyer"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "vendre objet"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Veux-tu vraiment vendre %s ?"
@@ -5713,106 +5726,106 @@ msgid "Away outfit"
 msgstr "Équipement en absence"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Changer de serveur"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Changer de personnage"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Vérification :"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-mail :"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr " Le mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr " Le mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -5828,232 +5841,237 @@ msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Acheter des objets"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Vendre des objets"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Annoncer"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Enchères"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Château de la guilde : %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Choisis le nom de la guilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Tu as été invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'a invité à rejoindre son groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "Vie :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "PM :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Compétence :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
@@ -6124,60 +6142,60 @@ msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Échange : Toi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Changer"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Vous donnez :"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Bous n'avez pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même "
 "objet dans cette fenêtre."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
@@ -6217,42 +6235,42 @@ msgid "Completed"
 msgstr "Terminé"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Mise à jour"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Sélection du monde"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Changer de Compte"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Choix du monde"
 
@@ -6366,9 +6384,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Type de cible :"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6441,6 +6458,11 @@ msgid "Return to safe video mode"
 msgstr "Revenir au mode vidéo sécurisé"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Afficher / Cacher les conversations"
@@ -7374,80 +7396,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr " -O --no-opengl : Désactiver OpenGL pour cette session"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Tu ne peux pas utiliser cette identification."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Erreur inconnue du serveur de personnage."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Stats incorrectes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Cheveux incorrects."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Race incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Apparence incorrecte."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Le message privé n'a pu être envoyé, %s n'est pas en ligne."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 "Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les "
@@ -7518,47 +7540,47 @@ msgstr "Château de la guilde : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
@@ -7579,32 +7601,32 @@ msgstr "Le nouveau mot de passe est trop court."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7612,12 +7634,12 @@ msgstr ""
 "MJs."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Client trop ancien."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7627,22 +7649,22 @@ msgstr ""
 "Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Mail incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
@@ -7682,265 +7704,225 @@ msgstr ""
 "Vous portez moins de la moitié du poids maximal de votre inventaire. Vous "
 "pouvez maintenant récupérer ta santé."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Échec de la transaction !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Émoticône non réalisée !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Vous n'avez pas pu vous asseoir !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Vous n'avez pas pu créer la conversation !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Vous n'avez pas pu rejoindre le groupe !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Vous ne pouvez pas crier !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Pas assez de vie !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP insuffisants !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Vous n'avez pas d'aide-mémoire !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Vous ne pouvez pas faire ça maintenant !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Vous portez trop de choses pour pouvoir faire ça !"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Hé ? Qu'est-ce donc que cela ?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Enchainement échoué..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Vous n'avez rien pu voler..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Le poison n'a pas eu d'effet..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Force %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Agilité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dextérité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Chance %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Force"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agilité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Dextérité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Chance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Défense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Attaque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Défense M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Dégâts par s."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Erreur inconnue."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Pas assez de vie !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP insuffisants !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Vous n'avez pas d'aide-mémoire !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Vous ne pouvez pas faire ça maintenant !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Vous portez trop de choses pour pouvoir faire ça !"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Hé ? Qu'est-ce donc que cela ?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7954,35 +7936,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Force :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agilité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitalité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Chance :"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Échec de la transaction !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Émoticône non réalisée !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Vous n'avez pas pu vous asseoir !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Vous n'avez pas pu créer la conversation !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Vous n'avez pas pu rejoindre le groupe !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Vous ne pouvez pas crier !"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Enchainement échoué..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Vous n'avez rien pu voler..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Le poison n'a pas eu d'effet..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -8023,85 +8050,85 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr "Attaque critique %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr "Attaque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr "Défense critique %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr "Défense M. %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Niveau %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr "Vitesse %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr "Portée %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr "Fuir %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -8498,6 +8525,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/he.po b/po/he.po
index 7a0727c90..ffa3c44ef 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr "עזרה"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "סחרר"
@@ -1520,8 +1520,8 @@ msgstr "סחרר"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr "תקוף"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "דבר"
@@ -1602,7 +1602,7 @@ msgstr "דבר"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "קנה"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "מכר"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "הורד"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "שחקנים"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "אחסן"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "החזר"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr "השתמש"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "השלך"
@@ -2173,49 +2212,49 @@ msgstr "השלך"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "פצל"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "יציאה"
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "הורד"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "הרם"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "שב"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "בחר אישור"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 498468dad..ccaff9344 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -483,8 +483,8 @@ msgstr "Pomoć"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trgovanje"
@@ -1521,8 +1521,8 @@ msgstr "Trgovanje"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1530,40 +1530,40 @@ msgstr "Napad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1581,9 +1581,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1592,7 +1592,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Govori"
@@ -1603,7 +1603,7 @@ msgstr "Govori"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,7 +1616,7 @@ msgstr "Kupi"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1626,26 +1626,26 @@ msgstr "Prodaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1653,52 +1653,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Skini opremu"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1708,20 +1747,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1730,7 +1769,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1738,69 +1777,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1810,79 +1849,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1891,64 +1930,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Pohrani"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Preuzmi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1958,7 +1997,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1968,41 +2007,41 @@ msgid "Use"
 msgstr "Upotrijebi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2010,155 +2049,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2166,7 +2205,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Ispusti"
@@ -2174,49 +2213,49 @@ msgstr "Ispusti"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Razdvoji"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2513,7 +2552,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -5160,7 +5199,7 @@ msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5269,19 +5308,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Skini opremu"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6293,71 +6319,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Pokupi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Sjedni"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "Odaberite OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 485096175..e905b1c58 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr "Súgó"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Üzlet"
@@ -1520,8 +1520,8 @@ msgstr "Üzlet"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr "Támadás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Csevegés"
@@ -1602,7 +1602,7 @@ msgstr "Csevegés"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Vétel"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Eladás"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Nem használ"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Játékosok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Raktároz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Magához vesz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr "Bevet"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Eldob"
@@ -2173,49 +2212,49 @@ msgstr "Eldob"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Felosztás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Nem használ"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Felvesz"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Ülés"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index f0299db5b..079b37a41 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -37,131 +37,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -172,7 +172,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan."
 
@@ -183,25 +183,25 @@ msgstr "Nama organisasi tidak ditemukan."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan."
 
@@ -289,77 +289,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "item terlalu berat."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "barang terlalu jauh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr ""
 
@@ -441,37 +441,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -487,42 +487,42 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
@@ -536,50 +536,50 @@ msgstr "Pergantian server"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Ubah sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -619,416 +619,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?)serangan"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) pergi"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) pergi"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1451,7 +1451,7 @@ msgstr "Komentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr ""
 
@@ -1474,36 +1474,36 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Batal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
@@ -1511,7 +1511,7 @@ msgstr "Berat: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tukar"
@@ -1527,42 +1527,42 @@ msgstr "Tukar"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Pukul"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Berbisik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
@@ -1587,8 +1587,8 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jalan"
@@ -1608,9 +1608,9 @@ msgstr "Berbicara"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Beli"
 
@@ -1621,9 +1621,9 @@ msgstr "Beli"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Jual"
 
@@ -1631,8 +1631,8 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
@@ -1658,35 +1658,48 @@ msgstr "Tambahkan ke daftar menyerang"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+msgid "Move to master"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Buang semuanya"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1698,53 +1711,52 @@ msgstr "Lepaskan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Kembalikan pengalihan obrolan."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Daftar barang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Ganti nama"
 
@@ -1754,20 +1766,20 @@ msgstr "Ganti nama"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1776,77 +1788,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Setelan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr ""
 
@@ -1856,79 +1868,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nama:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
@@ -1937,64 +1949,64 @@ msgstr "Tambahkan semua ke Penukaran"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Masukkan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Masukkan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Masukkan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Kembalikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2004,51 +2016,51 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Sembunyikan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Tampilkan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2056,155 +2068,155 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Jadikan teman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Mengikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Tirukan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Buang semuanya"
 
@@ -2212,57 +2224,57 @@ msgstr "Buang semuanya"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Pecah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "keluarkan"
 
@@ -2297,7 +2309,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2311,7 +2323,7 @@ msgstr "Obrolan"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Lainnya"
 
@@ -2534,8 +2546,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2556,9 +2568,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Keluar"
@@ -2569,10 +2581,10 @@ msgstr "Keluar"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2582,10 +2594,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2594,16 +2606,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s/ Total: %s"
@@ -2611,64 +2623,64 @@ msgstr "Harga: %s/ Total: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Ganti"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2679,30 +2691,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2947,7 +2959,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Organisasi"
 
@@ -3721,8 +3733,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Toko"
 
@@ -3739,8 +3751,8 @@ msgstr "Perbolehkan mode Jual"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4122,9 +4134,9 @@ msgstr "Perbolehkan berbisik"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Hapus"
@@ -4652,7 +4664,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Kelompok"
 
@@ -4779,7 +4791,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -4790,7 +4802,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -4806,7 +4818,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -4817,7 +4829,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr ""
 
@@ -4896,7 +4908,7 @@ msgstr "Pengecek Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Reset"
 
@@ -4906,67 +4918,67 @@ msgid "Result"
 msgstr "Hasil"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Buat"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Ganti alamat email"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Akun:%s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Tulis alamat email yang baru dua kali:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Pengisian alamat email tidak cocok."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Ganti sandi"
 
@@ -4974,36 +4986,36 @@ msgstr "Ganti sandi"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Kata Sandi:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "ketik sandi baru dua kali:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Masukkan sandi lama dahulu."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Password baru yang dimasukkan tidak cocok."
 
@@ -5017,8 +5029,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nama:"
 
@@ -5065,14 +5077,14 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Laki-laki"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Perempuan"
 
@@ -5120,57 +5132,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Ubah Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Main"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Tidak jadi mendaftar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Ganti email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5180,33 +5192,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5254,7 +5266,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -5294,14 +5306,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5323,7 +5335,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5335,47 +5347,47 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Tidak diketahui."
 
@@ -5486,137 +5498,137 @@ msgstr "Jacko bertelur"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Ingat username"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Menganti Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Mendaftar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Modifikasi sumber update"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Butuh"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Masukan"
 
@@ -5625,34 +5637,34 @@ msgstr "Masukan"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Tambah"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Kepada:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Kirim"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5674,106 +5686,106 @@ msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Ganti Server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -5789,228 +5801,233 @@ msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Toko personal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Beli barang"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Jual barang"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Umumkan"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -6081,58 +6098,58 @@ msgid "Save"
 msgstr "Simpan"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Dikonfirmasi. Menunggu..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Terima penukaran"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Terima. Menunggu..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Tukar: Anda"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Ubah"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
@@ -6172,42 +6189,42 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -6321,9 +6338,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Tipe target:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6396,6 +6412,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr ""
@@ -7322,78 +7343,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7462,47 +7483,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7523,43 +7544,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7567,22 +7588,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
@@ -7620,265 +7641,225 @@ msgstr ""
 "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
 "beregenerasi."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Anda tidak dapat melakukannya sekarang!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr ""
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr ""
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, c-format
+msgid "Unknown skill error: %d"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Anda tidak dapat melakukannya sekarang!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7892,35 +7873,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Kekuatan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Kecerdasan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Ketangkasan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7961,85 +7987,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
@@ -8435,6 +8461,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/it.po b/po/it.po
index ae51d7600..64390b54c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -42,131 +42,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d settimane"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d giorni"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d ore"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minuti"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d secondi"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -177,7 +177,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
@@ -188,25 +188,25 @@ msgstr "Manca il nome della gilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
@@ -294,77 +294,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Umano"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sei stato ucciso da %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "L'inventario è pieno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -373,43 +373,43 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -419,8 +419,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -447,37 +447,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -493,42 +493,42 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -542,50 +542,50 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -625,416 +625,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Errore di rete"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) Modalita' movimento standard"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) Modalita' movimento invertita"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Modalita' movimento casuale"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) Modalita' movimento casuale, estesa"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) Modalita' movimento casuale, personalizzata"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) Movimento casuale"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) spostati fino all'obbiettivo, default"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) spostati fino all'obbiettivo, distanza 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) spostati fino all'obbiettivo, distanza 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) spostati fino all'obbiettivo, distanza 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) spostati fino all'obbiettivo, distanza 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) spostati fino all'obbiettivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) Modalita' Segui, default"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) Modalita' Segui, relativa"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) Modalita' Segui, specchio"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) Modalita' Segui, pet"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) Modalita' Segui, sconosciuta"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) attacco"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) Attacco default"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) Cambia ad Attacco senza scudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) Cambia ad Attacco con scudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) Muovi e attacca"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) Muovi, attacca e raccogli"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) Disattiva Attacco automatico"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) Raccogli"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usa #flar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usa #chiza come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usa #ingrav come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usa #frillyar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usa #upmarmu come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) attacco magico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) Attacca tutti i giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) Attacca tutti eccetto amici"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) Attacca cattive relazioni"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) Non attaccare giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) Attacco PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Assente"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) Modalita' camera gioco"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) Modalita' camera libera"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1205,8 +1205,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(default)"
 
@@ -1457,7 +1457,7 @@ msgstr "Commento: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Crea gruppo"
 
@@ -1480,36 +1480,36 @@ msgstr "Crea gruppo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1517,7 +1517,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Commercia"
@@ -1533,42 +1533,42 @@ msgstr "Commercia"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
@@ -1593,8 +1593,8 @@ msgstr "Nascondi"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Movimento"
@@ -1614,9 +1614,9 @@ msgstr "Parla"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Compra"
 
@@ -1627,9 +1627,9 @@ msgstr "Compra"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1637,8 +1637,8 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
@@ -1664,35 +1664,49 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Muovi all'obbiettivo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Lascia tutto"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1704,53 +1718,52 @@ msgstr "Togli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Attiva/disattiva la chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -1760,20 +1773,20 @@ msgstr "Rinomina"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -1782,77 +1795,77 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Lascia"
 
@@ -1862,79 +1875,79 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -1943,64 +1956,64 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2010,51 +2023,51 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2062,155 +2075,155 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Invita nel party"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2218,57 +2231,57 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Caccia"
 
@@ -2303,7 +2316,7 @@ msgstr "Faccine"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2317,7 +2330,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Altro"
 
@@ -2540,8 +2553,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
@@ -2562,9 +2575,9 @@ msgstr "Apri url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Esci"
@@ -2575,10 +2588,10 @@ msgstr "Esci"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2588,10 +2601,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2600,16 +2613,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Massimo"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
@@ -2617,64 +2630,64 @@ msgstr "Prezzo: %s / Totale: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2685,30 +2698,30 @@ msgid "Battle"
 msgstr "Battaglia"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Annuncio generale:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annuncio generale da %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s sussurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2953,7 +2966,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gilda"
 
@@ -3729,8 +3742,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Negozio"
 
@@ -3747,8 +3760,8 @@ msgstr "Abilita la modalità negozio"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4130,9 +4143,9 @@ msgstr "Permetti sussurri"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Elimina"
@@ -4666,7 +4679,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Party"
 
@@ -4793,7 +4806,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -4804,7 +4817,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventario"
@@ -4820,7 +4833,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Abilità"
 
@@ -4831,7 +4844,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Sociale"
 
@@ -4910,7 +4923,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -4920,67 +4933,67 @@ msgid "Result"
 msgstr "Risultato"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Quantita':"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Crea"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Cambia l'indirizzo Email"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Account: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Scrivi due volte il nuovo indirizzo email:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Gli indirizzi email immessi non coincidono."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Cambia la Password"
 
@@ -4988,36 +5001,36 @@ msgstr "Cambia la Password"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Password:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Digita due volte la nuova password:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Inserisci prima la nuova password."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Le password immesse non coincidono."
 
@@ -5031,8 +5044,8 @@ msgstr "Nuovo Personaggio"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5079,14 +5092,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Maschio"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Femmina"
 
@@ -5134,57 +5147,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Cambia login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Gioca"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Informazioni"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Cambia email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5194,33 +5207,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Digitare password:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,7 +5281,7 @@ msgstr "Modifica Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Connetti"
 
@@ -5308,14 +5321,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Seleziona"
 
@@ -5337,7 +5350,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5349,47 +5362,47 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Sconosciuto."
 
@@ -5502,137 +5515,137 @@ msgstr "Comparsa jacko"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Autenticazione"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Ricorda username"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Aggiornamento:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Cambia server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registra"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Apri URL di registrazione"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra HP"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Barra dell'esperienza"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "Barra del peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "barra dell'inventario"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "Barra dei soldi"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "barra frecce"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "Barra dello stato"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "Barra dei punti lavoro"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Bisogno"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Invia"
 
@@ -5641,34 +5654,34 @@ msgstr "Invia"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Aggiungi"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "A:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Invia"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5690,106 +5703,106 @@ msgid "Away outfit"
 msgstr "Away outfit"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Cambia server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Cambia personaggio"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Conferma:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -5805,228 +5818,233 @@ msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Compra oggetti"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Vendi oggetti"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Annuncia"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Esperienza:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Lavoro:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Punti personaggio: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Punti correzione: %d"
@@ -6097,60 +6115,60 @@ msgid "Save"
 msgstr "Salva"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Confermato. In attesa..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Accetta scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Accettato. In attesa..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Cambia"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
 "finestra."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -6190,42 +6208,42 @@ msgid "Completed"
 msgstr "Completato"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Aggiornamento"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Chi è online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Seleziona parola"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Cambia login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Scegli parola"
 
@@ -6339,9 +6357,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Tipo di target:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6414,6 +6431,11 @@ msgid "Return to safe video mode"
 msgstr "Ritorna alla modalità video sicura"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
@@ -7343,78 +7365,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accesso negato. Probabilmente il server è sovraccarico."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "ID non disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Errore char-server sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Creazione personaggio non riuscita. Il nome è già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Nome errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Statistiche errate."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Taglio capelli errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Slot errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Razza errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personaggio eliminato."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Il messaggio privato non puo' essere inviato, %s e' offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Il messaggio privato e' stato ignorato da %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7483,47 +7505,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Oggetti in comune sconosciuti."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Esperienza in comune sconosciuta."
 
@@ -7544,32 +7566,32 @@ msgstr "La nuova password è troppo corta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "ID non registrato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Password errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Account scaduto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Rifiutato dal server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7577,12 +7599,12 @@ msgstr ""
 "per maggiori informazioni."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Versione del Client obsoleta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7592,22 +7614,22 @@ msgstr ""
 "Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Server affollato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Username già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Email errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Username cancellato permanentemente."
 
@@ -7646,265 +7668,225 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Scambio non riuscito!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Emote fallito!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Non puoi sederti!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Creazione Chat fallita!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Non puoi aggiungerti al Party!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Non puoi urlare!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Non hai raggiunto un Livello sufficientemente alto!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP insufficienti!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP Insufficienti!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Non hai nessun promemoria!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Al momento non puoi farlo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Non puoi usare questa Abilità con questa arma!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Hai bisogno un'altra Gemma Rossa!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Hai bisogno un'altra Gemma Blu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Stai trasportando troppo carico per compiere quest'azione!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Huh? Cos'è?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Teletrasporto fallito..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Non riesci a rubare niente..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Il veleno non ha effetto..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Accesso duplicato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Forza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agilità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Fortuna"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Difesa."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Attacco magico."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Difesa Magica."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasione"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Colpo critico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Ritardo Attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Ritardo Movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Range d'attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Danno per secondo."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Errore sconosciuto."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Non hai raggiunto un Livello sufficientemente alto!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP insufficienti!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP Insufficienti!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Non hai nessun promemoria!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Al momento non puoi farlo!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Non puoi usare questa Abilità con questa arma!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Hai bisogno un'altra Gemma Rossa!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Hai bisogno un'altra Gemma Blu!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Stai trasportando troppo carico per compiere quest'azione!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Huh? Cos'è?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7918,35 +7900,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vuole commerciare con te, accetti?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Forza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agilità:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Costituzione:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Fortuna:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Scambio non riuscito!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Emote fallito!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Non puoi sederti!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Creazione Chat fallita!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Non puoi aggiungerti al Party!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Non puoi urlare!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Teletrasporto fallito..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Non riesci a rubare niente..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Il veleno non ha effetto..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7987,85 +8014,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -8461,6 +8488,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index e3efcc50e..bc257cf95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -39,131 +39,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d週"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d日"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d時"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d分"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "空のささやきを送信することはできません!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "パーティ名がありません."
 
@@ -185,25 +185,25 @@ msgstr "ギルド名がありません."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "チャットを閉じます."
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "人間"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -369,43 +369,43 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -443,37 +443,37 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -489,42 +489,42 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -538,50 +538,50 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -621,416 +621,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) 攻撃範囲 - 1のターゲットまで移動"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) 友達以外を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイア"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "アウェイ"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1201,8 +1201,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1453,7 +1453,7 @@ msgstr "コメント: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "パーティを作る"
 
@@ -1476,36 +1476,36 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1513,7 +1513,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "トレード"
@@ -1529,42 +1529,42 @@ msgstr "トレード"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 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:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
@@ -1589,8 +1589,8 @@ msgstr "消す"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "動く"
@@ -1610,9 +1610,9 @@ msgstr "話す"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "買う"
 
@@ -1623,9 +1623,9 @@ msgstr "買う"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "売る"
 
@@ -1633,8 +1633,8 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1660,35 +1660,49 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "ターゲットまで移動"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "全て落とす"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1700,53 +1714,52 @@ msgstr "取外す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "改行キーでチャット入力ができます."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "マップアイテム"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1756,20 +1769,20 @@ msgstr "名前を変更する"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -1778,77 +1791,77 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "退会"
 
@@ -1858,79 +1871,79 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -1939,64 +1952,64 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2006,51 +2019,51 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2058,155 +2071,155 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "真似"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2214,57 +2227,57 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "追い出す"
 
@@ -2299,7 +2312,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "チャット"
 
@@ -2313,7 +2326,7 @@ msgstr "チャット"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "その他"
 
@@ -2536,8 +2549,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
@@ -2558,9 +2571,9 @@ msgstr "URLを開く"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "終了"
@@ -2571,10 +2584,10 @@ msgstr "終了"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2584,10 +2597,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2596,16 +2609,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
@@ -2613,64 +2626,64 @@ msgstr "価格:%s /合計:%s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2681,30 +2694,30 @@ msgid "Battle"
 msgstr "バトル"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "グローバルアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%sからのアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2949,7 +2962,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "ギルド"
 
@@ -3725,8 +3738,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "店"
 
@@ -3743,8 +3756,8 @@ msgstr "ショップモードを有効にする"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4126,9 +4139,9 @@ msgstr "全てのささやきを受け取る"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "削除"
@@ -4656,7 +4669,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "パーティー"
 
@@ -4783,7 +4796,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装着品"
 
@@ -4794,7 +4807,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "インベントリー"
@@ -4810,7 +4823,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "スキル"
 
@@ -4821,7 +4834,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "ソーシャル"
 
@@ -4900,7 +4913,7 @@ msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "リセット"
 
@@ -4910,67 +4923,67 @@ msgid "Result"
 msgstr "結果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "量:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "作成"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "メールアドレスの変更"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "アカウント: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "新しいメールアドレスを二回入力してください:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "メールアドレスが一致しません."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "パスワードの変更"
 
@@ -4978,36 +4991,36 @@ msgstr "パスワードの変更"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "パスワード:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "新しいパスワードを二回入力してください:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "元のパスワードを入力してください."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません."
 
@@ -5021,8 +5034,8 @@ msgstr "新しいキャラクター"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "名前:"
 
@@ -5069,14 +5082,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "男性"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "女性"
 
@@ -5124,57 +5137,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "このキャラクターを削除しますか?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "別アカウントでログイン"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "プレイ"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "情報"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "登録解除"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5184,33 +5197,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5258,7 +5271,7 @@ msgstr "サーバー編集"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "接続"
 
@@ -5298,14 +5311,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "選択"
 
@@ -5327,7 +5340,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5339,47 +5352,47 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "購入リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "販売リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "不明."
 
@@ -5490,137 +5503,137 @@ msgstr "JackOが出現中"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "アップデート:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "サーバー変更"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "登録"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "サーバー:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "アップデートホスト: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "健康"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "マナ"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Expバー"
 
 #. 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "金銭"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "矢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "情勢"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "職"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "必要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "決定"
 
@@ -5629,34 +5642,34 @@ msgstr "決定"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "追加"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "宛先:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "送信する"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5678,106 +5691,106 @@ msgid "Away outfit"
 msgstr "AFK中の服装"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "サーバーを変更する"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "キャラクターを変更する"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Eメール:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "ダウンロード準備中"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -5793,228 +5806,233 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "購入"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "販売"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "アナウンス"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "ギルド城: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "ギルド名"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "ジョブポイント:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点: %d"
@@ -6085,60 +6103,60 @@ msgid "Save"
 msgstr "セーブ"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "トレードを申請する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "確認中..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "トレードを了承する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "了承しました..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "トレード: 自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "変更"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
 "加することは出来ません."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
@@ -6178,42 +6196,42 @@ msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "アップデート"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "世界を選ぶ"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "ログインの変更"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "世界の選択"
 
@@ -6327,9 +6345,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "ターゲットタイプ:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6402,6 +6419,11 @@ msgid "Return to safe video mode"
 msgstr "セーフビデオモードへ戻る"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "トグルチャット"
@@ -7331,80 +7353,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "アクセスできません。サーバーが混みあっています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "このIDは使用できません."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "不明なキャラクターサーバーエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "名前が違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "間違った統計."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "間違った髪型."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "間違ったスロット."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "種別が間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "キャラクターを削除しました."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "%sがオフラインの為ささやきは送れませんでした."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "%sが完全無視設定をしている為ささやきは送れませんでした."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7473,47 +7495,47 @@ msgstr "ギルド城: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Expシェアモード不明."
 
@@ -7534,43 +7556,43 @@ msgstr "新しいパスワードは文字数が足りません."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "不明なエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "未登録なID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "アップデートが必要です."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7580,22 +7602,22 @@ msgstr ""
 "GMにご連絡下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "メールアドレスが違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました."
 
@@ -7631,265 +7653,225 @@ msgstr "インベントリーが体重の半分以上の為、体力は回復で
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "トレード失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "スマイリー表示失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "座れません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "チャット作成失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "パーティに参加できませんでした!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "叫べません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "あなたはまだ十分なlvlに達していません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "メモがありません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "今この行動はできません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "GPが足りません... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "このスキルはこの武器と一緒に使えません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Red Gemが必要です!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Blue Gemが必要です!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "アイテムを持ちすぎています!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "うん？何それ?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "ワープに失敗しました..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "何も盗めませんでした..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "毒の影響はなかった..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "攻撃力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "機敏さ"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "防御力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "魔力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "命中率"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "ダメージ/秒."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "不明なエラー."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "あなたはまだ十分なlvlに達していません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "メモがありません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "今この行動はできません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "GPが足りません... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "このスキルはこの武器と一緒に使えません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Red Gemが必要です!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Blue Gemが必要です!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "アイテムを持ちすぎています!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "うん？何それ?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7903,35 +7885,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたにトレードを申請しています?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "攻撃力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "機敏さ:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "防御力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "魔力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "命中率:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "幸運:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "トレード失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "スマイリー表示失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "座れません!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "チャット作成失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "パーティに参加できませんでした!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "叫べません!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "ワープに失敗しました..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "何も盗めませんでした..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "毒の影響はなかった..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7972,85 +7999,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -8446,6 +8473,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ka.po b/po/ka.po
index 4e48fd0b7..a7cb01acc 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,8 +1519,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2172,49 +2211,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6287,71 +6313,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 8bd1d2827..9b3083006 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -32,131 +32,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -165,7 +165,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr ""
 
@@ -176,25 +176,25 @@ msgstr ""
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr ""
 
@@ -282,77 +282,77 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +361,43 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr ""
 
@@ -435,37 +435,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -481,42 +481,42 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -613,416 +613,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1445,7 +1445,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr ""
 
@@ -1468,36 +1468,36 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1521,42 +1521,42 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 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:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr ""
 
@@ -1581,8 +1581,8 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1602,9 +1602,9 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr ""
 
@@ -1615,9 +1615,9 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr ""
 
@@ -1625,8 +1625,8 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr ""
 
@@ -1652,25 +1652,39 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+msgid "Move to master"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
 msgstr ""
 
@@ -1678,8 +1692,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1691,7 +1705,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
 msgstr ""
 
@@ -1699,44 +1713,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr ""
 
@@ -1746,20 +1760,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1768,77 +1782,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr ""
 
@@ -1848,79 +1862,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr ""
 
@@ -1929,64 +1943,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr ""
 
@@ -1996,51 +2010,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr ""
 
@@ -2048,155 +2062,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr ""
 
@@ -2204,57 +2218,57 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr ""
 
@@ -2289,7 +2303,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr ""
 
@@ -2303,7 +2317,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr ""
 
@@ -2526,8 +2540,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -2548,9 +2562,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
@@ -2561,10 +2575,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr ""
 
@@ -2574,10 +2588,10 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr ""
 
@@ -2586,16 +2600,16 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -2603,64 +2617,64 @@ msgstr ""
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2671,30 +2685,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2939,7 +2953,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr ""
 
@@ -3713,8 +3727,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr ""
 
@@ -3731,8 +3745,8 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr ""
 
@@ -4114,9 +4128,9 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr ""
@@ -4644,7 +4658,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr ""
 
@@ -4771,7 +4785,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr ""
 
@@ -4782,7 +4796,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -4798,7 +4812,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr ""
 
@@ -4809,7 +4823,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr ""
 
@@ -4888,7 +4902,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr ""
 
@@ -4898,67 +4912,67 @@ msgid "Result"
 msgstr ""
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr ""
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr ""
 
@@ -4966,36 +4980,36 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr ""
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr ""
 
@@ -5009,8 +5023,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr ""
 
@@ -5057,14 +5071,14 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr ""
 
@@ -5112,57 +5126,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5172,33 +5186,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5246,7 +5260,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr ""
 
@@ -5286,14 +5300,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5315,7 +5329,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5327,47 +5341,47 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr ""
 
@@ -5480,137 +5494,137 @@ msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr ""
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr ""
 
@@ -5619,34 +5633,34 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr ""
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr ""
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5668,106 +5682,106 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -5783,228 +5797,233 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr ""
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, 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:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -6075,58 +6094,58 @@ msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -6166,42 +6185,42 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -6389,6 +6408,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr ""
@@ -7315,78 +7339,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7455,47 +7479,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7516,43 +7540,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7560,22 +7584,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7611,265 +7635,225 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr ""
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr ""
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, c-format
+msgid "Unknown skill error: %d"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7883,35 +7867,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7952,85 +7981,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
@@ -8426,6 +8455,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 1f3997ce2..1faa827a9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr "Hjelp"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,8 +1520,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Kjøp"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Selg"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spillere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr "Bruk"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2173,49 +2212,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Del opp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 8e01530c1..94dbe2dad 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -485,8 +485,8 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1196,8 +1196,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1471,20 +1471,20 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1508,7 +1508,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1523,8 +1523,8 @@ msgstr "Handel"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1532,40 +1532,40 @@ msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1583,9 +1583,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Beweeg"
@@ -1594,7 +1594,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Spreken"
@@ -1605,7 +1605,7 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1618,7 +1618,7 @@ msgstr "Kopen"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1628,26 +1628,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1655,52 +1655,91 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Afdoen"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1710,20 +1749,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1732,7 +1771,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1740,69 +1779,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1812,79 +1851,79 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1893,64 +1932,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -1960,7 +1999,7 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1970,41 +2009,41 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2012,155 +2051,155 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2168,7 +2207,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2176,49 +2215,49 @@ msgstr "Neerleggen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr "Schop"
 
@@ -2515,7 +2554,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -5162,7 +5201,7 @@ msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5271,19 +5310,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Afdoen"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6293,71 +6319,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 727b68cb4..0f9d4ed7c 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -36,131 +36,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -171,7 +171,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
@@ -182,25 +182,25 @@ msgstr "Guild-naam ontbreekt."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
@@ -288,77 +288,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -441,37 +441,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -487,42 +487,42 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -536,50 +536,50 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -619,416 +619,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Netwerkfout"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) aanval"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) weg"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) weg"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Weg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
@@ -1474,36 +1474,36 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1511,7 +1511,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1527,42 +1527,42 @@ msgstr "Handel"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
@@ -1587,8 +1587,8 @@ msgstr "Nuke"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Beweeg"
@@ -1608,9 +1608,9 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1621,9 +1621,9 @@ msgstr "Kopen"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1631,8 +1631,8 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr ""
 
@@ -1658,35 +1658,49 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Beweeg tot aan Doel"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Laat alles vallen"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1698,53 +1712,52 @@ msgstr "Afdoen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Ga terug naar chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1754,20 +1767,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1776,77 +1789,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1856,79 +1869,79 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr ""
 
@@ -1937,64 +1950,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2004,51 +2017,51 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2056,155 +2069,155 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2212,57 +2225,57 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Schop"
 
@@ -2297,7 +2310,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2311,7 +2324,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Andere"
 
@@ -2534,8 +2547,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
@@ -2556,9 +2569,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Afsluiten"
@@ -2569,10 +2582,10 @@ msgstr "Afsluiten"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2582,10 +2595,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2594,16 +2607,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Maximum"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
@@ -2611,64 +2624,64 @@ msgstr "Prijs: %s / Totaal: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2679,30 +2692,30 @@ msgid "Battle"
 msgstr "Gevecht"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2947,7 +2960,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guild"
 
@@ -3721,8 +3734,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Winkel"
 
@@ -3739,8 +3752,8 @@ msgstr "shop modus aanzetten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4122,9 +4135,9 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Verwijderen"
@@ -4658,7 +4671,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Groep"
 
@@ -4785,7 +4798,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -4796,7 +4809,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventaris"
@@ -4812,7 +4825,7 @@ msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -4823,7 +4836,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Sociaal"
 
@@ -4902,7 +4915,7 @@ msgstr "Bot Controleerder"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Reset"
 
@@ -4912,67 +4925,67 @@ msgid "Result"
 msgstr "Resultaat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Aanmaken"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Emailadres wijzigen"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Account: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Type nieuw email adres twee maal:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "De email adres ingaven zijn niet gelijk."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -4980,36 +4993,36 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Wachtwoord:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Type nieuw paswoord tweel maal:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Geef het oude paswoord eerst."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
@@ -5023,8 +5036,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Naam:"
 
@@ -5071,14 +5084,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Vrouwelijk"
 
@@ -5126,57 +5139,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Verwissel Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spelen"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Wijzig Email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5186,33 +5199,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5260,7 +5273,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -5300,14 +5313,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5329,7 +5342,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5341,47 +5354,47 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -5494,137 +5507,137 @@ msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Inloggen"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Onthoud gebruikersnaam"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Update:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Wijzig Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Manuele update server"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Nood"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Indienen"
 
@@ -5633,34 +5646,34 @@ msgstr "Indienen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Aan:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Verzenden"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "verkoop voorwerp"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5682,106 +5695,106 @@ msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Van server wisselen"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -5797,228 +5810,233 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Koop voorwerpen"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Verkoop voorwerpen"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "Leven:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Ervaring:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Magie:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Personagepunten: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Correctiepunten: %d"
@@ -6089,60 +6107,60 @@ msgid "Save"
 msgstr "Bewaren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Veranderen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
@@ -6182,42 +6200,42 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Bijwerken"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Selecteer Wereld"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Wijzig Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Kies Wereld"
 
@@ -6331,9 +6349,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Doel Type:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6406,6 +6423,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr ""
@@ -7332,80 +7354,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7474,47 +7496,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7535,43 +7557,43 @@ msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7581,22 +7603,22 @@ msgstr ""
 "Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd."
 
@@ -7634,265 +7656,225 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Handel mislukte!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Emoticon gefaald!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Zitten niet mogelijk!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Chatcreatie mislukte!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Kan je niet bij de groep voegen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Kan niet roepen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Je hebt nog geen hoog genoeg level bereikt!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Onvoldoende leven!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Onvoldoende Vaardigheidspunten!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Je hebt geen memo's!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Je kan dat nu niet doen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Je hebt een andere rode edelsteen nodig!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Je hebt een andere blauwe edelsteen nodig!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Je draagt teveel bij je om dit te doen!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Huh? Wat is dat?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Warp mislukt..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Kon niets stelen..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Gif had geen effect..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Handigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr ""
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Onbekende fout."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Je hebt nog geen hoog genoeg level bereikt!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Onvoldoende leven!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Onvoldoende Vaardigheidspunten!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Je hebt geen memo's!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Je kan dat nu niet doen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Je hebt een andere rode edelsteen nodig!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Je hebt een andere blauwe edelsteen nodig!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Je draagt teveel bij je om dit te doen!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Huh? Wat is dat?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7906,35 +7888,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Geluk:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Handel mislukte!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Emoticon gefaald!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Zitten niet mogelijk!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Chatcreatie mislukte!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Kan je niet bij de groep voegen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Kan niet roepen!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Warp mislukt..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Kon niets stelen..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Gif had geen effect..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7975,85 +8002,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -8450,6 +8477,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index e1e5b4fc9..3ffb50729 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -40,131 +40,131 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d tygodni/e"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni/e"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dni"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d godzin/y"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minut/y"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d sekund/y"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
@@ -185,25 +185,25 @@ msgstr "Brak nazwy gildii."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -371,43 +371,43 @@ msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -417,8 +417,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -445,37 +445,37 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 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:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -491,42 +491,42 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -540,50 +540,50 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -623,416 +623,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Błąd sieci"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) szalone ruchy numer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr "(4) przybliżenie do celu do odległości 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr "(6) przybliżenie do celu do odległości 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr "(8) przybliżenie do celu do odległości 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr "(9) przybliżenie do celu do odległości 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) podejdź do celu na zasięg ataku - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) atak"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) atakuj niezaprzyjaźnionych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) nie atakuj graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr "(e) mapa bez tekstur, pokazane kolizje"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr "(E) mapa bez tekstur"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr "(?) widok mapy"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) AFK"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) stan"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "AFK"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
@@ -1203,8 +1203,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1455,7 +1455,7 @@ msgstr "Komentarz: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
@@ -1478,36 +1478,36 @@ msgstr "Utwórz grupę"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
@@ -1515,7 +1515,7 @@ msgstr "Waga: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1531,42 +1531,42 @@ msgstr "Handel"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Atak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
@@ -1591,8 +1591,8 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Podejdź"
@@ -1612,9 +1612,9 @@ msgstr "Rozmowa"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Kup"
 
@@ -1625,9 +1625,9 @@ msgstr "Kup"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1635,8 +1635,8 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
@@ -1662,35 +1662,49 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Podejdź do celu"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Upuść wszystko"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1702,53 +1716,52 @@ msgstr "Zdejmij"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Return włącza czat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Portal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1758,20 +1771,20 @@ msgstr "Zmień nazwę"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -1780,77 +1793,77 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1860,79 +1873,79 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nick:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -1941,64 +1954,64 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2008,51 +2021,51 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "W dół"
 
@@ -2060,155 +2073,155 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imituj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2216,57 +2229,57 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Podziel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Wyrzuć"
 
@@ -2301,7 +2314,7 @@ msgstr "Emotki"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Czat"
 
@@ -2315,7 +2328,7 @@ msgstr "Czat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Inne"
 
@@ -2538,8 +2551,8 @@ msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
@@ -2560,9 +2573,9 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Wyjdź"
@@ -2573,10 +2586,10 @@ msgstr "Wyjdź"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2586,10 +2599,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2598,16 +2611,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Maks."
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
@@ -2615,64 +2628,64 @@ msgstr "Cena: %s/ Razem: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2683,30 +2696,30 @@ msgid "Battle"
 msgstr "Bitwa"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Ogłoszenie ogólne:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -2951,7 +2964,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gildia"
 
@@ -3727,8 +3740,8 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Sklep"
 
@@ -3745,8 +3758,8 @@ msgstr "Włącz tryb sklepu"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4130,9 +4143,9 @@ msgstr "Zezwól na szepty"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Usuń"
@@ -4665,7 +4678,7 @@ msgstr "Portale: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grupa"
 
@@ -4792,7 +4805,7 @@ msgstr "EKW"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -4803,7 +4816,7 @@ msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -4819,7 +4832,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -4830,7 +4843,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Społeczność"
 
@@ -4909,7 +4922,7 @@ msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -4919,67 +4932,67 @@ msgid "Result"
 msgstr "Rezultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Utwórz przedmioty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Ilość:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Utwórz"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Zmień adres e-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Proszę wpisać i potwierdzić adres e-mail:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Nowy adres e-mail musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Nowy adres e-mail musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Pola adresu e-mail się nie zgadzają."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -4987,36 +5000,36 @@ msgstr "Zmień hasło"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Hasło:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Proszę wpisać i potwierdzić hasło:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Proszę wpisać stare hasło."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Nowe hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Nowe hasło nie może mieć mniej znakół niż %u."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Potwierdzenie hasła nie zgadza się."
 
@@ -5030,8 +5043,8 @@ msgstr "Nowa postać"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -5078,14 +5091,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Mężczyzna"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Kobieta"
 
@@ -5133,57 +5146,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Konto %s (czas poprzedniego zalogowania %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Przeloguj się"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Graj"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Konto: %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5198,33 +5211,33 @@ msgstr ""
 "Doświadczenie: %u\n"
 "Pieniądze: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "zwierzątko gracza %s's"
@@ -5272,7 +5285,7 @@ msgstr "Edytuj serwer"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Połącz"
 
@@ -5312,14 +5325,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Wybierz"
 
@@ -5341,7 +5354,7 @@ msgstr "Czy wiesz, że..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5353,47 +5366,47 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Nieznany obiekt."
 
@@ -5508,137 +5521,137 @@ msgstr "Jack-O spawnuje się"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Zaloguj się"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Zapamiętaj login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Aktualizacja:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Zmień serwer"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Rejestruj"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Zaawansowane ustawienia aktualizacji"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Serwer:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Host aktualizacji: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Otwórz stronę z rejestracją"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "pasek życia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "pasek many"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "pasek punktów doświadczenia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "pasek obciążenia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "pasek miejsc w inwentarzu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "pasek pieniędzy"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "pasek strzał"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "pasek statusu"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "pasek punktów umiejętności"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Potrzeba"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Zatwierdź"
 
@@ -5647,34 +5660,34 @@ msgstr "Zatwierdź"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Dodaj"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Do:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Wyślij"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "sprzedaj przedmiot"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Czy naprawdę chcesz sprzedać %s?"
@@ -5696,106 +5709,106 @@ msgid "Away outfit"
 msgstr "Strój na afk"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Zmień serwer"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Zmień postać"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Nazwa użytkownika musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Nazwa użytkownika musi być krótsza niż %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Hasło musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -5811,228 +5824,233 @@ msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Kupuj"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Sprzedaj"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Ogłoś"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Aukcja"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Zamek gildii: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Praca:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Punkty postaci: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Punkty korekcyjne: %d"
@@ -6103,60 +6121,60 @@ msgid "Save"
 msgstr "Zachowaj"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Zmień"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
@@ -6196,42 +6214,42 @@ msgid "Completed"
 msgstr "Zakończono"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Aktualizuj"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Gracze online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Wybierz świat"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Przeloguj się"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Wybierz świat"
 
@@ -6345,9 +6363,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Rodzaj celu:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6420,6 +6437,11 @@ msgid "Return to safe video mode"
 msgstr "Powrót do bezpiecznego trybu wyświetlania"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
@@ -7346,78 +7368,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Nie można użyć tego ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Nieznany błąd serwera postaci."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Nieprawidłowe staty."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Nieprawidłowe włosy."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Nieprawidłowe miejsce inwentarza."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Nieprawidłowa rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Niewłaściwy wygląd."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Postać skasowana."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Szept nie mógł zostać wysłany, %s jest offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7486,49 +7508,49 @@ msgstr "Zamek gildii: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
 "poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Nieznany stan podziału doświadczenia."
 
@@ -7549,43 +7571,43 @@ msgstr "Nowe hasło jest zbyt krótkie."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7595,22 +7617,22 @@ msgstr ""
 "Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Nieprawidłowy adres e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
@@ -7649,265 +7671,225 @@ msgstr ""
 "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
 "zdrowie."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Handel zakończony niepowodzeniem!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Emotka nieudana!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Nie można usiąść!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Nie można stworzyć czatu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Nie udało się dołączyć do grupy!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Nie można krzyczeć!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Nie masz jeszcze wymaganego poziomu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Zbyt niskie HP!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Zbyt niska mana!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Nie masz notek!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Nie możesz tego teraz zrobić!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Chyba brak Ci kasy... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Potrzebujesz innego czerwonego klejnotu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Potrzebujesz innego niebieskiego klejnotu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Niesiesz za duży ciężar by to zrobić!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Eee? A to to co?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Nie udało się przeteleportować..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Nie udało się niczego ukraść..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Trucizna nie zadziałała..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Siła %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Zwinność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Żywotność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencja %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Celność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Szczęście %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Siła"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Zwinność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Witalność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Inteligencja"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Celność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Szczęście"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Obrona"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Atak mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Obrona mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Nieznany błąd."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Nie masz jeszcze wymaganego poziomu!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Zbyt niskie HP!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Zbyt niska mana!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Nie masz notek!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Nie możesz tego teraz zrobić!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Chyba brak Ci kasy... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Potrzebujesz innego czerwonego klejnotu!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Potrzebujesz innego niebieskiego klejnotu!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Niesiesz za duży ciężar by to zrobić!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Eee? A to to co?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7921,35 +7903,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z Tobą, zgadzasz się?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Siła:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Szybkość:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Witalność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Celność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Szczęście:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Handel zakończony niepowodzeniem!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Emotka nieudana!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Nie można usiąść!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Nie można stworzyć czatu!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Nie udało się dołączyć do grupy!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Nie można krzyczeć!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Nie udało się przeteleportować..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Nie udało się niczego ukraść..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Trucizna nie zadziałała..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7990,85 +8017,85 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr "Atak krytyczny %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr "Atak magią %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr "Obrona krytyczna %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr "Obrona magiczna %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "PŻ %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Poziom %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr "Prędkość poruszania %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr "Zasięg %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr "Ominięcie %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -8468,6 +8495,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index a133f8180..fef92f01c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -36,131 +36,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Variáveis ​​de ambiente despejadas"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -171,7 +171,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -182,25 +182,25 @@ msgstr "Falta o nome da guilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
@@ -288,77 +288,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "l"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,43 +367,43 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -413,8 +413,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -441,37 +441,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -487,42 +487,42 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -536,50 +536,50 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -619,416 +619,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco numero %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover até o alvo em distancia de ataque-1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Indisponivel"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1199,8 +1199,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1451,7 +1451,7 @@ msgstr "Comentário: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Criar grupo"
 
@@ -1474,36 +1474,36 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1511,7 +1511,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1527,42 +1527,42 @@ msgstr "Negócios"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
@@ -1587,8 +1587,8 @@ msgstr "Desaparecer"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1608,9 +1608,9 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1621,9 +1621,9 @@ msgstr "Comprar"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Vender"
 
@@ -1631,8 +1631,8 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1658,35 +1658,49 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Mover para o alvo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Descartar tudo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1698,53 +1712,52 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter alterna para o chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1754,20 +1767,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1776,77 +1789,77 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Sair"
 
@@ -1856,79 +1869,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1937,64 +1950,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2004,51 +2017,51 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2056,155 +2069,155 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2212,57 +2225,57 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2297,7 +2310,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2311,7 +2324,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Outro"
 
@@ -2534,8 +2547,8 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
@@ -2556,9 +2569,9 @@ msgstr "Abrir URL"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Sair"
@@ -2569,10 +2582,10 @@ msgstr "Sair"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2582,10 +2595,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2594,16 +2607,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Máximo"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
@@ -2611,64 +2624,64 @@ msgstr "Preço: %s / Total: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2679,30 +2692,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline."
@@ -2947,7 +2960,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guilda"
 
@@ -3723,8 +3736,8 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Loja"
 
@@ -3741,8 +3754,8 @@ msgstr "Habilitar modo loja"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4124,9 +4137,9 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Excluir"
@@ -4658,7 +4671,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grupo"
 
@@ -4785,7 +4798,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -4796,7 +4809,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventário"
@@ -4812,7 +4825,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4823,7 +4836,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Social"
 
@@ -4902,7 +4915,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4912,67 +4925,67 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Criar"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Alterar e-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Conta: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Digite o novo email duas vezes:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "O novo email deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ".O novo email precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -4980,36 +4993,36 @@ msgstr "Alterar senha"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Senha:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Digite a nova senha duas vezes:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Primeiro entre com a antiga senha."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
@@ -5023,8 +5036,8 @@ msgstr "Novo Pesonagem"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5071,14 +5084,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Mulher"
 
@@ -5126,57 +5139,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Conta %s (Logado pela última vez em %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jogar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5191,33 +5204,33 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5265,7 +5278,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5305,14 +5318,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Selecionar"
 
@@ -5334,7 +5347,7 @@ msgstr "Você Sabia..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5346,47 +5359,47 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -5499,137 +5512,137 @@ msgstr "Aparição do JackO"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Atualização:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Atualizando Servidores: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Abrir URL de cadastro"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra de Vida"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "Barra de Peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Precisa"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5638,34 +5651,34 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "Vender item"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Você realmente deseja vender %s?"
@@ -5687,106 +5700,106 @@ msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O Usuários deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O Usuário  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -5802,228 +5815,233 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Comprar itens"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Vender itens"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Castelo Guilda : %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
@@ -6094,59 +6112,59 @@ msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Mudar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -6186,42 +6204,42 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Atualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -6335,9 +6353,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Tipo de alvo:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6410,6 +6427,11 @@ msgid "Return to safe video mode"
 msgstr "Retornar para modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
@@ -7341,78 +7363,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7481,47 +7503,47 @@ msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -7542,32 +7564,32 @@ msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7575,12 +7597,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7590,22 +7612,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
@@ -7645,265 +7667,225 @@ msgstr ""
 "Você está carregando menos da metade de seu peso. Você vai recuperar-se "
 "novamente."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Falha na negociação!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Falha no emoticon!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Falha ao sentar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Falha ao criar Chat!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Impossivel entrar no grupo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Impossivel gritar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Você ainda não tem o nivel necessário!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP insuficiente!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Você não tem nenhuma nota armazenada!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Você não pode fazer isso agora!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que você precisa de mais dinheiro... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Você precisa de outra gema vermelha!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Você precisa de outra jóia azul!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Você está com muita carga para fazer isso!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Hã? O que é isso?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Falha ao transportar..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Não foi possível roubar nada..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Veneno não surtiu efeito..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Erro desconhecido."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Você ainda não tem o nivel necessário!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP insuficiente!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Você não tem nenhuma nota armazenada!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Você não pode fazer isso agora!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que você precisa de mais dinheiro... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Você precisa de outra gema vermelha!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Você precisa de outra jóia azul!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Você está com muita carga para fazer isso!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Hã? O que é isso?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7917,35 +7899,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Sorte:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Falha na negociação!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Falha no emoticon!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Falha ao sentar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Falha ao criar Chat!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Impossivel entrar no grupo!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Impossivel gritar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Falha ao transportar..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Não foi possível roubar nada..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Veneno não surtiu efeito..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7986,85 +8013,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -8461,6 +8488,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 36901f9ac..4e68bbf4c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr "Arquivo enviado"
 
@@ -46,131 +46,131 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d Semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d Dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d Horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "configuaração de arquivos enviados em:"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviado em:"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -181,7 +181,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -192,25 +192,25 @@ msgstr "Falta o nome da guilda."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
@@ -298,77 +298,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -377,43 +377,43 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -423,8 +423,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -451,37 +451,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 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:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -497,42 +497,42 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -546,50 +546,50 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -629,416 +629,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "cmdpintar fontedelinhadepintar arquivodst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr "(4) Mover ao alvo com distância 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr "(6) Mover ao alvo com distância 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr "(8) Mover ao alvo com distância 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr "(9) Mover ao alvo com distância 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover ao alvo em alcance de ataque -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de estimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr "(e) visão de mapa vazio com colisão"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr "(E) visão de mapa vazio"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr "(?) visualização do mapa"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) Modo Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Indisponivel"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
@@ -1209,8 +1209,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1461,7 +1461,7 @@ msgstr "Comentário: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Criar grupo"
 
@@ -1484,36 +1484,36 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1521,7 +1521,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1537,42 +1537,42 @@ msgstr "Negócios"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
@@ -1597,8 +1597,8 @@ msgstr "Desaparecer"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1618,9 +1618,9 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1631,9 +1631,9 @@ msgstr "Comprar"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Vender"
 
@@ -1641,8 +1641,8 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Add comentário"
 
@@ -1668,35 +1668,49 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Mover para o alvo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Descartar tudo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1708,53 +1722,52 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter alterna para o chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1764,20 +1777,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1786,77 +1799,77 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Sair"
 
@@ -1866,79 +1879,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1947,64 +1960,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2014,51 +2027,51 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2066,155 +2079,155 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2222,57 +2235,57 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Checar ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2307,7 +2320,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2321,7 +2334,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Outro"
 
@@ -2544,8 +2557,8 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
@@ -2566,9 +2579,9 @@ msgstr "Abrir URL"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Sair"
@@ -2579,10 +2592,10 @@ msgstr "Sair"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2592,10 +2605,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2604,16 +2617,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Máximo"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
@@ -2621,64 +2634,64 @@ msgstr "Preço: %s / Total: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr "Alcance: %d"
@@ -2689,30 +2702,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline."
@@ -2957,7 +2970,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guilda"
 
@@ -3733,8 +3746,8 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Loja"
 
@@ -3751,8 +3764,8 @@ msgstr "Habilitar modo loja"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4138,9 +4151,9 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Excluir"
@@ -4672,7 +4685,7 @@ msgstr "Portais: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grupo"
 
@@ -4799,7 +4812,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -4810,7 +4823,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventário"
@@ -4826,7 +4839,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4837,7 +4850,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Social"
 
@@ -4916,7 +4929,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4926,67 +4939,67 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Criar"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Alterar e-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Conta: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Digite o novo email duas vezes:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "O novo email deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "A nova senha deve ter menos que %u caracteres."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -4994,36 +5007,36 @@ msgstr "Alterar senha"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Senha:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Digite a nova senha duas vezes:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Primeiro entre com a antiga senha."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "A nova senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
@@ -5037,8 +5050,8 @@ msgstr "Novo Personagem"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Nome:"
 
@@ -5085,14 +5098,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Mulher"
 
@@ -5140,57 +5153,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Conta %s (Último acesso em %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Jogar"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Informações"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr "Por favor insira novo pincode"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5205,33 +5218,33 @@ msgstr ""
 "Experiência: %u\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "Animal de %s"
@@ -5279,7 +5292,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5319,14 +5332,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Selecionar"
 
@@ -5348,7 +5361,7 @@ msgstr "Você sabia que ..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5360,47 +5373,47 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -5513,137 +5526,137 @@ msgstr "Aparição do JackO"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Atualização:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Atualizando Servidor: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Abrir endereço de registro"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "Barra de Vida"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "Barra de Peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Precisa"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Nível Job: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5652,34 +5665,34 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "Vender itens"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Você realmente quer vender: %s?"
@@ -5701,106 +5714,106 @@ msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Trocar servidor"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O nome do usuário precisa ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O nome do usuário deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -5816,228 +5829,233 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Comprar itens"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Vender itens"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Leilão"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Castelo Guilda : %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
@@ -6108,59 +6126,59 @@ msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Mudar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -6200,42 +6218,42 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Atualizar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -6349,9 +6367,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Tipo de alvo:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6424,6 +6441,11 @@ msgid "Return to safe video mode"
 msgstr "Retornar para o modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
@@ -7354,78 +7376,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Aparência incorreta."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 "Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
@@ -7495,47 +7517,47 @@ msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -7556,32 +7578,32 @@ msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -7589,12 +7611,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7604,22 +7626,22 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente."
 
@@ -7659,265 +7681,225 @@ msgstr ""
 "Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
 "novamente."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Falha na negociação!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Falha no emoticon!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Falha ao sentar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Falha ao criar Chat!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Impossivel entrar no grupo!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Impossivel gritar!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Você ainda não tem o nivel necessário!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP insuficiente!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Você não tem nenhuma nota armazenada!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Você não pode fazer isso agora!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que você precisa de mais dinheiro... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Você precisa de outra gema vermelha!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Você precisa de outra jóia azul!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Você está com muita carga para fazer isso!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Hã? O que é isso?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Falha ao transportar..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Não foi possível roubar nada..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Veneno não surtiu efeito..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Força %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Erro desconhecido."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Você ainda não tem o nivel necessário!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP insuficiente!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Você não tem nenhuma nota armazenada!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Você não pode fazer isso agora!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que você precisa de mais dinheiro... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Você precisa de outra gema vermelha!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Você precisa de outra jóia azul!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Você está com muita carga para fazer isso!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Hã? O que é isso?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7931,35 +7913,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Sorte:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Falha na negociação!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Falha no emoticon!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Falha ao sentar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Falha ao criar Chat!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Impossivel entrar no grupo!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Impossivel gritar!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Falha ao transportar..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Não foi possível roubar nada..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Veneno não surtiu efeito..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -8000,85 +8027,85 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defesa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Nível %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidade %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr "Fugir %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -8475,6 +8502,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index f4ad8d9c1..74857d87f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -29,7 +29,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -42,131 +42,131 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -177,7 +177,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Не указано название группы."
 
@@ -188,25 +188,25 @@ msgstr "Не задано имя гильдии."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
@@ -294,77 +294,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Человек"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "уклонение"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "Б"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,43 +374,43 @@ msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -420,8 +420,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -448,37 +448,37 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -494,42 +494,42 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -543,50 +543,50 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -626,416 +626,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Ошибка сети"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумасшедшие движения"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) сумасшедшее движение %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумасшедшие движения"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr "(4) движение к цели на расстояние 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr "(6) движение к цели на расстояние 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr "(8) движение к цели на расстояние 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr "(9) движение к цели на расстояние 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) движение к цели на расстояние атаки - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) атаковать всех кроме друзей"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) не атаковать игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr "(e) режим пустой карты с коллизиями"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr "(E) режим пустой карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr "(?) неизвестный режим карты"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) отошел"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Отошел"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
@@ -1206,8 +1206,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1458,7 +1458,7 @@ msgstr "Комментарий: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Создать группу"
 
@@ -1481,36 +1481,36 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Отмена"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
@@ -1518,7 +1518,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Торговать"
@@ -1534,42 +1534,42 @@ msgstr "Торговать"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 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:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
@@ -1594,8 +1594,8 @@ msgstr "Уничтожить"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Движение"
@@ -1615,9 +1615,9 @@ msgstr "Разговор"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Купить"
 
@@ -1628,9 +1628,9 @@ msgstr "Купить"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Продать"
 
@@ -1638,8 +1638,8 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
@@ -1665,35 +1665,49 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Движение к цели"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Бросить все"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1705,53 +1719,52 @@ msgstr "Снять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter переключает Вас на окно чата."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Элемент карты"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1761,20 +1774,20 @@ msgstr "Переименовать"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -1783,77 +1796,77 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1863,79 +1876,79 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Имя:                     "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -1944,64 +1957,64 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2011,51 +2024,51 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2063,155 +2076,155 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2219,57 +2232,57 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Кикнуть"
 
@@ -2304,7 +2317,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Чат"
 
@@ -2318,7 +2331,7 @@ msgstr "Чат"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Другое"
 
@@ -2541,8 +2554,8 @@ msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
@@ -2563,9 +2576,9 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Выход"
@@ -2576,10 +2589,10 @@ msgstr "Выход"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2589,10 +2602,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2601,16 +2614,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Макс"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
@@ -2618,64 +2631,64 @@ msgstr "Цена: %s / Всего: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr "Дистанция: %d"
@@ -2686,30 +2699,30 @@ msgid "Battle"
 msgstr "Битва"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Глобальное объявление:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальное объявление от %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -2954,7 +2967,7 @@ msgstr "ГМ"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Гильдия"
 
@@ -3730,8 +3743,8 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Магазин"
 
@@ -3748,8 +3761,8 @@ msgstr "Включить режим магазина"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4137,9 +4150,9 @@ msgstr "Разрешить шептание"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Удалить"
@@ -4673,7 +4686,7 @@ msgstr "Порталов: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Группа"
 
@@ -4800,7 +4813,7 @@ msgstr "СН"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -4811,7 +4824,7 @@ msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -4827,7 +4840,7 @@ msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Умения"
 
@@ -4838,7 +4851,7 @@ msgstr "ОБЩ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Общество"
 
@@ -4917,7 +4930,7 @@ msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -4927,67 +4940,67 @@ msgid "Result"
 msgstr "Результат"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Создание предметов"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Количество:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Создать"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Учётная запись: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Введите новый адрес E-mail дважды:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Новый адрес email должен содержать не менее %u символов."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Новый адрес email должен содержать не более %u символов."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "Адрес E-mail не совпадает."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Изменить пароль"
 
@@ -4995,36 +5008,36 @@ msgstr "Изменить пароль"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Пароль:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Введите новый пароль дважды:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Введите старый пароль."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Пароль должен содержать не менее %u символов."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Новый пароль не совпадает."
 
@@ -5038,8 +5051,8 @@ msgstr "Новый персонаж"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Имя:"
 
@@ -5086,14 +5099,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Мужчина"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Женщина"
 
@@ -5141,57 +5154,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Аккаунт %s (последний вход %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Сменить героя"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Играть"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Сведения"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr "Пожалуйста, установите новый пин код"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5206,33 +5219,33 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -5280,7 +5293,7 @@ msgstr "Редактирование сервера"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -5320,14 +5333,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотя бы адрес и порт сервера."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "Выбор"
 
@@ -5349,7 +5362,7 @@ msgstr "Знаете ли вы..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5361,47 +5374,47 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -5516,137 +5529,137 @@ msgstr "jacko появляется"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Вход"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Запомнить логин"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Обновления:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Сменить сервер"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Сервер:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Сервер обновлений: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Открыть ссылку регистрации"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "здоровье"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "мана"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "деньги"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "стрелы"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "статус"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "работа"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Нужно"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Применить"
 
@@ -5655,34 +5668,34 @@ msgstr "Применить"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Добавить"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Для:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Отправить"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "продажа предмета"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Вы действительно хотите продать %s?"
@@ -5704,106 +5717,106 @@ msgid "Away outfit"
 msgstr "наряд отсутствия"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Сменить сервер"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Имя пользователя должно содержать не менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Имя пользователя должно содержать менее %u символов."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Пароль должен содержать не менее %u символов."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -5819,228 +5832,233 @@ msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Купить"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Продать"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Аукцион"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Замки: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не первое."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Имя группы"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "Жизнь:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Опыт:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Мана:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Профессия:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
@@ -6111,60 +6129,60 @@ msgid "Save"
 msgstr "Сохранить"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Подтвердить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Сменить"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
@@ -6204,42 +6222,42 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Обновить"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Выбрать Сервер"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Сменить логин"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Выберите сервер"
 
@@ -6353,9 +6371,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Тип цели:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6428,6 +6445,11 @@ msgid "Return to safe video mode"
 msgstr "Вернуться в безопасный видео режим"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
@@ -7356,80 +7378,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Неправильная раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Неправильная внешность."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Персонаж удален."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Сообщение не может быть отправлено, %s оффлайн."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr "Приватное сообщение не может быть послано. Вас игнорируют все игроки."
 
@@ -7498,47 +7520,47 @@ msgstr "Замки: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Обмен предметами включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
@@ -7559,43 +7581,43 @@ msgstr "Новый пароль слишком короткий."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Неверный пароль."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Клиент устарел."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7604,22 +7626,22 @@ msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Сервер переполнен."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Пользователь удален."
 
@@ -7659,265 +7681,225 @@ msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
 "восстанавливаться."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Не удалось начать торговлю!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Не удалось использовать смайлик!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Не удалось присесть!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Не удалось создать чат!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Нельзя присоединиться к группе!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Нельзя кричать!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "У Вас недостаточный уровень!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Недостаточно ОЖ!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Недостаточно Маны!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "У Вас нет записей!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Вы не можете сделать это сейчас!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Похоже, Вам нужно больше денег... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Вы не можете использовать это умение с этим видом оружия!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Вам нужен другой красный камень!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Вам нужен другой синий камень!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Вы несёте слишком много, чтобы сделать это!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "А? Что это?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Изменение не удалось..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Не удалось ничего украсть..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Яд не подействовал..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Сила (str)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Неизвестная ошибка."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "У Вас недостаточный уровень!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Недостаточно ОЖ!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Недостаточно Маны!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "У Вас нет записей!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Вы не можете сделать это сейчас!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Похоже, Вам нужно больше денег... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Вы не можете использовать это умение с этим видом оружия!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Вам нужен другой красный камень!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Вам нужен другой синий камень!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Вы несёте слишком много, чтобы сделать это!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "А? Что это?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7931,35 +7913,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Сила (str):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Удача (luk):"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Не удалось начать торговлю!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Не удалось использовать смайлик!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Не удалось присесть!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Не удалось создать чат!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Нельзя присоединиться к группе!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Нельзя кричать!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Изменение не удалось..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Не удалось ничего украсть..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Яд не подействовал..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -8000,85 +8027,85 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критическая атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr "Защита от критической атаки %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "Жизнь %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Уровень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr "Скорость %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr "Расстояние %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr "Уклонение %s"
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -8474,6 +8501,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 4a5848fa4..632da92e8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -483,8 +483,8 @@ msgstr "Nápoveda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1521,8 +1521,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1530,40 +1530,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1581,9 +1581,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1592,7 +1592,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1603,7 +1603,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1616,7 +1616,7 @@ msgstr "Kúpiť"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1626,26 +1626,26 @@ msgstr "Predaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1653,52 +1653,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Odstrojiť"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1708,20 +1747,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1730,7 +1769,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1738,69 +1777,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1810,79 +1849,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1891,64 +1930,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1958,7 +1997,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1968,41 +2007,41 @@ msgid "Use"
 msgstr "Použiť"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2010,155 +2049,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2166,7 +2205,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Zahodiť"
@@ -2174,49 +2213,49 @@ msgstr "Zahodiť"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2513,7 +2552,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -5160,7 +5199,7 @@ msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5269,19 +5308,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Odstrojiť"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6293,71 +6319,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 23b221978..77308af05 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,8 +1520,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2173,49 +2212,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 84ea67226..0d0826de6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -482,8 +482,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1468,20 +1468,20 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1520,8 +1520,8 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1580,9 +1580,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Flytta"
@@ -1591,7 +1591,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Prata med"
@@ -1602,7 +1602,7 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Köp"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1652,52 +1652,91 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Unequip"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1707,20 +1746,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1729,7 +1768,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1809,79 +1848,79 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1890,64 +1929,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -1957,7 +1996,7 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2009,155 +2048,155 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2165,7 +2204,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Släng"
@@ -2173,49 +2212,49 @@ msgstr "Släng"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2512,7 +2551,7 @@ msgstr "Öppna url"
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr "Normal font"
 msgid "Fonts"
 msgstr "Fonter"
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "Unequip"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
+msgid "Catch pet"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:150
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:150
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d78e885f4..d125a54b6 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
 "manaplus/language/sv_SE/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -33,131 +33,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Det går inte skicka tomma viskningar!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -168,7 +168,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Gruppnamn saknas."
 
@@ -179,25 +179,25 @@ msgstr "Guild-namn saknas."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Meddelande stänger chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Enter nu, växlar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
@@ -285,77 +285,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "Människa"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du blev dödad av herr %s"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -364,43 +364,43 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -410,8 +410,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -438,37 +438,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -484,42 +484,42 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -533,50 +533,50 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -616,416 +616,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Nätverksfel"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) standardrörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) invertera rörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) rör sig med några crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) rör sig med crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normal + crazy"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) okänt move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) crazy move nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) standard crazy move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) crazy move"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) standardrörelse mot target"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) närmar sig target med distans 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) närmar sig target med distance 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr " (3) närmar sig target med distans 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr " (5) närmar sig target med distans 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr " (7) närmar sig target med distans 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr " (A) närmar sig target till attack range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) archer attack-range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) flyttar till target för attack-range - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) förflyttar sig till target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) standard follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) relativ follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) härma follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) pet follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) okänd follow"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) attack"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) standardattack"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) växla attack utan shield"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) växla attack med shield"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) gå och attackera"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) gå, attackera, pickup"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) utan automatisk attack"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) liten pick up 1x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standard pick up 2x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) framåt pick up 2x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) pick up 3x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) gå och pick up med distans 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) gå och pick up med distans 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) gå och pick up med maximal distans"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) pick up"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) använd #flar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) använd #chiza för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) använd #ingrav för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) använd #frillyar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) använd #upmarmu för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) magic attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) attackera alla spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) attackera alla utom dina friends"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) attackera dåliga relationer"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) attackera inte spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) pvp-attack"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) Standardimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) klädselimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "Game modifiers är aktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "Game modifiers är inaktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "Game modifiers är okända"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) normal kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) debug kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ultra-kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-kartvy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) svartvit kartvy"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) på tangentbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) away"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Iväg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) spelkamera-läge"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr "Vill du öppna support-sidan?"
 
@@ -1196,8 +1196,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1448,7 +1448,7 @@ msgstr "Kommentar: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Skapa Party"
 
@@ -1471,36 +1471,36 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
@@ -1508,7 +1508,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1524,42 +1524,42 @@ msgstr "Trade"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
@@ -1584,8 +1584,8 @@ msgstr "Nuke"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Flytta"
@@ -1605,9 +1605,9 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Köp"
 
@@ -1618,9 +1618,9 @@ msgstr "Köp"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1628,8 +1628,8 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr ""
 
@@ -1655,35 +1655,49 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Flytta till Target"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Släng allt"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1695,53 +1709,52 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter för att växla chat."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1751,20 +1764,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1773,77 +1786,77 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1853,79 +1866,79 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1934,64 +1947,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2001,51 +2014,51 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2053,155 +2066,155 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2209,57 +2222,57 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2294,7 +2307,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Chat"
 
@@ -2308,7 +2321,7 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "Annat"
 
@@ -2531,8 +2544,8 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
@@ -2553,9 +2566,9 @@ msgstr "Öppna url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Avsluta"
@@ -2566,10 +2579,10 @@ msgstr "Avsluta"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2579,10 +2592,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2591,16 +2604,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -2608,64 +2621,64 @@ msgstr "Pris: %s / Totalt: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2676,30 +2689,30 @@ msgid "Battle"
 msgstr "Battle"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -2944,7 +2957,7 @@ msgstr "GM"
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guild"
 
@@ -3720,8 +3733,8 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Shop"
 
@@ -3738,8 +3751,8 @@ msgstr "Aktivera shop mode"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4122,9 +4135,9 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Radera"
@@ -4656,7 +4669,7 @@ msgstr "Portaler: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Party"
 
@@ -4783,7 +4796,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -4794,7 +4807,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventory"
@@ -4810,7 +4823,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Skills"
 
@@ -4821,7 +4834,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Social"
 
@@ -4900,7 +4913,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Återställ"
 
@@ -4910,67 +4923,67 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "Antal:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Skapa"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Ändra e-postadress"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Skriv in e-postadressen igen:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr "Den nya epost-adressen måste vara minst %u tecken långt."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr "Den nya epost-adressen måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "E-postadressen matchar inte."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Ändra Lösenord"
 
@@ -4978,36 +4991,36 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Lösenord:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Skriv in lösenordet igen:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Skriv in det gamla lösenordet först."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr "Det nya lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr "Det nya lösenordet måste vara kortare än %u tecken långt."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Det nya lösenordet matchar inte."
 
@@ -5021,8 +5034,8 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "Namn:"
 
@@ -5069,14 +5082,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Kvinna"
 
@@ -5124,57 +5137,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill radera denna karaktär?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Konto %s (senaste inloggning var %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Ändra inloggad"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spela"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "Ändra lösenord"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5189,33 +5202,33 @@ msgstr ""
 "Experience: %u⏎\n"
 "Money: %s"
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5263,7 +5276,7 @@ msgstr "Editera Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Anslut"
 
@@ -5305,14 +5318,14 @@ msgstr ""
 "servern."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5334,7 +5347,7 @@ msgstr "Viste du att..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5346,47 +5359,47 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -5499,137 +5512,137 @@ msgstr "jacko spawnar"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Login"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Kom ihåg användarnamn"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Uppdatera:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Ändra Server"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Anpassad uppdatering-host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "Uppdatera host: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr "Öppna register-url"
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "health bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "mana bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "experience bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "weight bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "inventory slots bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "money bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "arrows bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "status bar"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "job bar"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Behöver"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Submit"
 
@@ -5638,34 +5651,34 @@ msgstr "Submit"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Lägg till"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Till:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Skicka"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Misslyckades att sända som avsändare eller felaktig bokstav."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr "Sälj item"
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr "Vill du verkligen sälja %s?"
@@ -5687,106 +5700,106 @@ msgid "Away outfit"
 msgstr "Borta-klädsel"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Byt server"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Godkänn:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Användarnamnet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Användarnamnet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Lösenordet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Lösenordet överensstämmer inte."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Välj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Ladda"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Använd samma ip för spelunderservrar"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Laddar hem server-lista...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Väntar på server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "Förbereder hemladdning"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Fel uppstod när serverlistan hämtades!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "Nyare version behövs"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "v%s behövs"
@@ -5802,228 +5815,233 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Köp items"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Sälj items"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vill %s %s, accepterar du?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "Guild slott: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Skapar guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Skapar partyt %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Guild-namn"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Välj ditt guild-namn."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Du har blivit inbjuden att joina ett party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du har blivit inbjuden att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig att joina deras party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "Jobb:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Karaktär-points: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Correction points: %d"
@@ -6094,60 +6112,60 @@ msgid "Save"
 msgstr "Spara"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Föreslå trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Gå med på trade"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Överenskommet. Väntar..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Trade: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "Du får %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Byt"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
 "fönstret."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
@@ -6187,42 +6205,42 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Uppdaterar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Välj värld"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Ändra login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Välj värld"
 
@@ -6336,9 +6354,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Target-typ:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6411,6 +6428,11 @@ msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Växla Chat"
@@ -7340,80 +7362,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
 "taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Viskning kunde inte sändas, %s är offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Viskning kunde inte sändas, ignorerad av %s."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7482,47 +7504,47 @@ msgstr "Guild slott: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Exp-delning är okänd."
 
@@ -7543,44 +7565,44 @@ msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Okänt fel."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7590,22 +7612,22 @@ msgstr ""
 "teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
@@ -7641,265 +7663,225 @@ msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Trade misslyckades!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "Emote misslyckades!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "Sit misslyckades!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "Chat-skapning misslyckades!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Kunde inte joina partyt!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "Kan inte skjuta!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Du har ännu inte nått required lvl!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "Otillräckligt HP!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "Otillräckligt SP!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "Du har inga memos!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Du kan inte göra det just nu!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "Verkar som att du behöver mer money... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Du kan inte använda denna skill med det vapnet!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Du behöver en till röd gem!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Du behöver en till blå gem!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "Du bär för mycket för att kunna göra detta!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "Huh? Vad är det?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "Warp failed..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "Kan inte stjäla något..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "Poison hade ingen effekt..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Okänt fel."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Du har ännu inte nått required lvl!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Otillräckligt HP!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Otillräckligt SP!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Du har inga memos!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Du kan inte göra det just nu!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Verkar som att du behöver mer money... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Du kan inte använda denna skill med det vapnet!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Du behöver en till röd gem!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Du behöver en till blå gem!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Du bär för mycket för att kunna göra detta!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Huh? Vad är det?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7913,35 +7895,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Strength:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Agility:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "Luck:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Trade misslyckades!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Emote misslyckades!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Sit misslyckades!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Chat-skapning misslyckades!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Kunde inte joina partyt!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Kan inte skjuta!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Warp failed..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Kan inte stjäla något..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Poison hade ingen effekt..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7982,85 +8009,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -8456,6 +8483,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/te.po b/po/te.po
index af4d5d5ff..c143930e6 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr "సహాయం"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,8 +1520,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1529,40 +1529,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,52 +1652,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1746,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1776,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1809,79 +1848,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1890,64 +1929,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1957,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1967,41 +2006,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2009,155 +2048,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2165,7 +2204,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2173,49 +2212,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2512,7 +2551,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
@@ -5159,7 +5198,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5268,19 +5307,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6290,71 +6316,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 916e0b3f6..ff47f2e0f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,8 +1519,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "ซื้อ"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr "ใช้"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "ทิ้ง"
@@ -2172,49 +2211,49 @@ msgstr "ทิ้ง"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "ออก"
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6287,71 +6313,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 50491fd16..37b1e5058 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -35,131 +35,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "Boş sohbet gönderilemez!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -170,7 +170,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "Grup adı eksik."
 
@@ -181,25 +181,25 @@ msgstr "Lonca adı eksik."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "Enter tuşu sohbeti açar/kapatır."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "Sohbeti kapatır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "Enter tuşu sohbeti sonlandırır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "Mesaj sohbeti kapatır."
 
@@ -287,77 +287,77 @@ msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "ıskalandı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan nesne toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "Nesne çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "Nesne çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "Nesne başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "Nesne toplamada bilinmeyen hata oluştu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -366,43 +366,43 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -412,8 +412,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -440,37 +440,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -486,42 +486,42 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -535,50 +535,50 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "Hesap kapatma başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -618,416 +618,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) git, saldır, topla"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) varsayılan taklit"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) kıyafet taklidi"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) taklit"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "Uzakta"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1198,8 +1198,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "Grup kur"
 
@@ -1473,36 +1473,36 @@ msgstr "Grup kur"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "İptal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
@@ -1510,7 +1510,7 @@ msgstr "Ağırlık: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Takas"
@@ -1526,42 +1526,42 @@ msgstr "Takas"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "Saldırı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 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:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr ""
 
@@ -1586,8 +1586,8 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Taşı"
@@ -1607,9 +1607,9 @@ msgstr "Konuş"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1620,9 +1620,9 @@ msgstr "Satın Al"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "Sat"
 
@@ -1630,8 +1630,8 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr ""
 
@@ -1657,35 +1657,49 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "Hedefe git"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "Bırak"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1697,53 +1711,52 @@ msgstr "Çıkar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "Enter tuşu sohbeti açar/kapatır."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "Gruptan at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "Harita nesnesi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr ""
 
@@ -1753,20 +1766,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1775,77 +1788,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -1855,79 +1868,79 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "Lonca pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "İsim:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -1936,64 +1949,64 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Almak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2003,51 +2016,51 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr ""
 
@@ -2055,155 +2068,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "Taklit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr ""
 
@@ -2211,57 +2224,57 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "Bölme"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr ""
 
@@ -2296,7 +2309,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -2310,7 +2323,7 @@ msgstr "Sohbet"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr ""
 
@@ -2533,8 +2546,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "Para: %s"
@@ -2555,9 +2568,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "Çıkış"
@@ -2568,10 +2581,10 @@ msgstr "Çıkış"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2581,10 +2594,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2593,16 +2606,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "En Fazla"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
@@ -2610,64 +2623,64 @@ msgstr "Fiyat: %s / Toplam: %s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "Dünzenle"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2678,30 +2691,30 @@ msgid "Battle"
 msgstr "Savaş"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s'ten Küresel duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2946,7 +2959,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Lonca"
 
@@ -3723,8 +3736,8 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -3741,8 +3754,8 @@ msgstr "Mağaza modunu etkinleştir"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4124,9 +4137,9 @@ msgstr "Fısıltılara izin ver"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "Sil"
@@ -4654,7 +4667,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grup"
 
@@ -4781,7 +4794,7 @@ msgstr "EKP"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -4792,7 +4805,7 @@ msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Envanter"
@@ -4808,7 +4821,7 @@ msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "Yetenekler"
 
@@ -4819,7 +4832,7 @@ msgstr "SOS"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "Sosyal"
 
@@ -4898,7 +4911,7 @@ msgstr "Bot Kontrolörü"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -4908,67 +4921,67 @@ msgid "Result"
 msgstr "Sonuç"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "Oluştur"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "E-posta Adresi Değiştir"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "Hesap:% s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "Yeni e-posta adresini tekrar yaz:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "E-posta adresleri uyuşmuyor."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "Şifre Değiştir"
 
@@ -4976,36 +4989,36 @@ msgstr "Şifre Değiştir"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "Şifre:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "Yeni şifreni ikinci tekrar yaz:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "Önce eski şifreni yaz."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "Yeni şifre girdilerin uyuşmuyor."
 
@@ -5019,8 +5032,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "İsim:"
 
@@ -5067,14 +5080,14 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "Erkek"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "Kadın"
 
@@ -5122,57 +5135,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Bu karakteri silmek istediğinize emin misiniz?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "Hesap Değiştir"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Oyna"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "Bilgi"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Kaydı Sil"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5182,33 +5195,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5256,7 +5269,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -5296,14 +5309,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5325,7 +5338,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5337,47 +5350,47 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "Saklanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -5490,137 +5503,137 @@ msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "Oturum Aç"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "Kullanıcı adını hatırla"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "Güncelle:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "Sunucu Değiştir"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "Kayıt ol"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "Elle güncelleme sunucusu"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "Sunucu:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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 "envanter yer çubuğu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "Gereklilik"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "Onayla"
 
@@ -5629,34 +5642,34 @@ msgstr "Onayla"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "Ekle"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "Alıcı:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "Gönder"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gönderen olarak gönderme yapılamadı ya da hatalı karakter."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5678,106 +5691,106 @@ msgid "Away outfit"
 msgstr "Uzak elbisesi"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "Sunucu değiştir"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "Karakter değiştir"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "Onayla:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "E-Posta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "Alt oyun sunucuları için aynı IP' yi kullan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
@@ -5793,228 +5806,233 @@ msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "Nesne satın al"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "Nesne sat"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "Duyuru"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "Duyuruda linkleri göster"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "%s isimli lonca oluşturuluyor."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "%s adlı grup kuruluyor."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Lonca Adı"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Loncanızın adını seçiniz."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "Bir gruba katılma daveti aldın."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s grubuna katılmaya davet edildin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s seni gruplarına davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "İş: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "İş:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "Karakter Puanları: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "Düzeltme puanları: %d"
@@ -6085,60 +6103,60 @@ msgid "Save"
 msgstr "Kayıt"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "Takas teklif et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "Doğrulandı. Bekleniyor..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "Takası kabul et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "Kabul edildi. Bekleniyor..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "Takas: Sen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "%s alıyorsun"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "Değiştir"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
 "koyamazsınız."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "İsim: %s"
@@ -6178,42 +6196,42 @@ msgid "Completed"
 msgstr "Tamamlandı"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Kimler Online - Güncelleniyor"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "Güncelle"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Kimler Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Kimler Online - hata"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Kimler Online - Güncelle"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "Dünya Seç"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "Hesabı Değiştir"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Dünya Seç"
 
@@ -6327,9 +6345,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "Hedef Tipi:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6402,6 +6419,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "Sohbete Geç"
@@ -7328,78 +7350,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "Yanlış yer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Fısıltı gönderilemedi, %s tarafından görmezden gelindi."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7468,47 +7490,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7529,43 +7551,43 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "Bilinemeyen hata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "Hesap silinmiş."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7573,22 +7595,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7624,265 +7646,225 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "Takas başarılı olamadı!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "Gruba katılınamadı!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr ""
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "Güç"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "Çeviklik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "Yaşam Gücü"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "Zeka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "Maharet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "Şans"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr ""
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "Bilinemeyen hata."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr ""
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7896,35 +7878,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s sana takas isteği yolladı, kabul ediyor musun?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "Güç:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "Çeviklik:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "Yaşam Gücü:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "Zeka:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "Maharet:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr ""
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "Takas başarılı olamadı!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Gruba katılınamadı!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr ""
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7965,85 +7992,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -8439,6 +8466,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/vls.po b/po/vls.po
index 26da79e5d..0946815f9 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,8 +1519,8 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2172,49 +2211,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr ""
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr ""
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6289,71 +6315,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 71b25137b..5f490c48a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -40,131 +40,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白私信!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -173,7 +173,7 @@ msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你�
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "帮会名称缺失."
 
@@ -184,25 +184,25 @@ msgstr "公会名称缺失."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "讯息关闭聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "<回车>键现在促发聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天."
 
@@ -290,77 +290,77 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "你被 %s 杀掉了"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -368,43 +368,43 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -414,8 +414,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -442,37 +442,37 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -488,42 +488,42 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -537,50 +537,50 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -620,416 +620,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "网络错误"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) 攻击所有玩家"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "距离"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1200,8 +1200,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1452,7 +1452,7 @@ msgstr "评论: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "建立"
 
@@ -1475,36 +1475,36 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -1512,7 +1512,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1528,42 +1528,42 @@ msgstr "交易"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 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:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr ""
 
@@ -1588,8 +1588,8 @@ msgstr ""
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "移动"
@@ -1609,9 +1609,9 @@ msgstr "说话"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "购买"
 
@@ -1622,9 +1622,9 @@ msgstr "购买"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "出售"
 
@@ -1632,8 +1632,8 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1659,35 +1659,49 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "移动到目标"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "所有"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1699,53 +1713,52 @@ msgstr "卸下装备"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "<回车>键促发聊天."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "地图项"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "重命名"
 
@@ -1755,20 +1768,20 @@ msgstr "重命名"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr ""
 
@@ -1777,77 +1790,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "留下"
 
@@ -1857,79 +1870,79 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr ""
 
@@ -1938,64 +1951,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2005,51 +2018,51 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr ""
 
@@ -2057,155 +2070,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "所有"
 
@@ -2213,57 +2226,57 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr ""
 
@@ -2298,7 +2311,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "聊天"
 
@@ -2312,7 +2325,7 @@ msgstr "聊天"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "其他"
 
@@ -2535,8 +2548,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
@@ -2557,9 +2570,9 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "退出"
@@ -2570,10 +2583,10 @@ msgstr "退出"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2583,10 +2596,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2595,16 +2608,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
@@ -2612,64 +2625,64 @@ msgstr "价格：%s / 总价：%s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2680,30 +2693,30 @@ msgid "Battle"
 msgstr "战斗"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "全局公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2948,7 +2961,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "帮会"
 
@@ -3722,8 +3735,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "商店"
 
@@ -3740,8 +3753,8 @@ msgstr "启用商店模式"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4123,9 +4136,9 @@ msgstr "允许密语"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "删除"
@@ -4653,7 +4666,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "t"
 
@@ -4780,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装备"
 
@@ -4791,7 +4804,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "物品栏"
@@ -4807,7 +4820,7 @@ msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "技能"
 
@@ -4818,7 +4831,7 @@ msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr ""
 
@@ -4897,7 +4910,7 @@ msgstr "挂机检查"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "重置"
 
@@ -4907,67 +4920,67 @@ msgid "Result"
 msgstr "结果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "建立"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "更换Email地址"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "帐号：%s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "两次新的电子邮件地址:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "电子邮件地址不匹配."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "更换密码"
 
@@ -4975,36 +4988,36 @@ msgstr "更换密码"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "密码:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "输入两次新密码:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "先输入旧密码."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配."
 
@@ -5018,8 +5031,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "姓名:"
 
@@ -5066,14 +5079,14 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "帅哥"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "美女"
 
@@ -5121,57 +5134,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "登录"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "开始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5181,33 +5194,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5255,7 +5268,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "连接"
 
@@ -5295,14 +5308,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr ""
 
@@ -5324,7 +5337,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5336,47 +5349,47 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "添加到购买商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "添加到出售商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "未知."
 
@@ -5487,137 +5500,137 @@ msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "登录"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "记住用户名"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "更新日期:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "更改服务器"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "注册"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "服务器:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "法力栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 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:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "钱栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "状态栏"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "需要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "提交"
 
@@ -5626,34 +5639,34 @@ msgstr "提交"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "添加"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "至:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "发送"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5675,106 +5688,106 @@ msgid "Away outfit"
 msgstr ""
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "交换服务器"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "交换角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "确认:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "电子邮件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, 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:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -5790,228 +5803,233 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "购买物品"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "出售物品"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "公布"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, c-format
+msgid "Failed skill: %s"
+msgstr ""
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "公会名称"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "选择n的名称."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "经验:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "职业:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -6082,58 +6100,58 @@ msgid "Save"
 msgstr "保存"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "打算交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "同意交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "交易：你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "改变"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "你给予:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
@@ -6173,42 +6191,42 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "更新"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "选择世界"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "切换登陆"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "选择世界"
 
@@ -6322,9 +6340,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "目标类型:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6397,6 +6414,11 @@ msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "切换聊天"
@@ -7323,78 +7345,78 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "错误的名称."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "不正确的统计."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "不正确的头发."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "角色已删除."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "密语无法发送，%s离线."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7463,47 +7485,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7524,43 +7546,43 @@ msgstr "新密码太短."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "未知的错误."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "未注册的ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "错误的密码."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "账户过期失效."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "客户端太旧."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7570,22 +7592,22 @@ msgstr ""
 "请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7621,265 +7643,225 @@ msgstr "你已携带超过半数负重。无法回复健康（体力）."
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "交易失败!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "发送表情失败!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "原地休息失败!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "聊天创建失败!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "不能加入工会!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "无法呼喊!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "你还没有达到足够的等级!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "没有备忘录!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "你无法办到!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "看起来需要更多金币... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器无法用来使用此项技能!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "你需要另一颗红宝石!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "你需要另一颗蓝宝石!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "你已负重太多，无法办到!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "啊？那是什么?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "传送失败..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "无法偷取任何物品..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "毒药无效..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "重复登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "生命"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "智慧"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "未知的错误."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "你还没有达到足够的等级!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "没有备忘录!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "你无法办到!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "看起来需要更多金币... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "此武器无法用来使用此项技能!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "你需要另一颗红宝石!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "你需要另一颗蓝宝石!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "你已负重太多，无法办到!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "啊？那是什么?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7893,35 +7875,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "力量:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "敏捷:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "生命:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "智力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "灵巧:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "幸运:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "交易失败!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "发送表情失败!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "原地休息失败!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "聊天创建失败!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "不能加入工会!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "无法呼喊!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "传送失败..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "无法偷取任何物品..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "毒药无效..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7962,85 +7989,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -8436,6 +8463,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/zh_HK.po b/po/zh_HK.po
index af6b47100..0ae849ad7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr "說明"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1519,8 +1519,8 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "購買"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "卸下裝備"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丟棄"
@@ -2172,49 +2211,49 @@ msgstr "丟棄"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "離開"
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "卸下裝備"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6287,71 +6313,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:156
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:162
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:168
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:174
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:180
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:186
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:192
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:198
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ae498ac96..5d9e38388 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-22 22:25+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-23 16:06+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -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:468 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2634
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2680
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,8 +481,8 @@ msgstr "說明"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:647
-#: src/gui/popups/popupmenu.cpp:879 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
+#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2295
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:319
-#: src/gui/popups/popupmenu.cpp:367 src/gui/popups/popupmenu.cpp:463
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:545
-#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:601
-#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:808
-#: src/gui/popups/popupmenu.cpp:835 src/gui/popups/popupmenu.cpp:868
-#: src/gui/popups/popupmenu.cpp:2037 src/gui/popups/popupmenu.cpp:2073
-#: src/gui/popups/popupmenu.cpp:2123 src/gui/popups/popupmenu.cpp:2165
-#: src/gui/popups/popupmenu.cpp:2206 src/gui/popups/popupmenu.cpp:2274
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2386
-#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2433
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2806
-#: src/gui/popups/popupmenu.cpp:2932 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
+#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
+#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
+#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
+#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
+#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
+#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:129
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:720
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1519,8 +1519,8 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:271
-#: src/gui/popups/popupmenu.cpp:723 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
 #: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack"
@@ -1528,40 +1528,40 @@ msgstr "攻擊"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
-#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
+#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:760
+#: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
+#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:451
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
+#: src/gui/popups/popupmenu.cpp:797
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:234
+#: src/gui/popups/popupmenu.cpp:236
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:569
-#: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
+#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
+#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:249 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:251 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "說話"
@@ -1601,7 +1601,7 @@ msgstr "說話"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "購買"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
 #: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
 #: src/gui/windows/buyselldialog.cpp:74
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:262 src/gui/popups/popupmenu.cpp:398
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
+#: src/gui/popups/popupmenu.cpp:2814
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:283
+#: src/gui/popups/popupmenu.cpp:285
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:294
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,52 +1651,91 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:298 src/gui/popups/popupmenu.cpp:2788
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:309
+msgid "Fire"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: src/gui/popups/popupmenu.cpp:316
+msgid "Feed"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:319
+msgid "Drop loot"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "卸下裝備"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:326
+msgid "Return to egg"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:314 src/gui/popups/popupmenu.cpp:459
+#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:344 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:2713
-#: src/gui/popups/popupmenu.cpp:2737
+#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:501
+#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:506 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2109 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
+#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:527 src/gui/popups/popupmenu.cpp:559
+#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:556
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1745,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:533 src/gui/popups/popupmenu.cpp:2348
-#: src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2428
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:540 src/gui/popups/popupmenu.cpp:565
+#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:572
+#: src/gui/popups/popupmenu.cpp:598
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1767,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:590 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1775,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:593
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:619 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:622
+#: src/gui/popups/popupmenu.cpp:648
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:652 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:659
+#: src/gui/popups/popupmenu.cpp:685
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:665
+#: src/gui/popups/popupmenu.cpp:691
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:671
+#: src/gui/popups/popupmenu.cpp:697
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:683
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
 msgid "Leave"
 msgstr ""
 
@@ -1808,79 +1847,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:701 src/gui/popups/popupmenu.cpp:2450
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
+#: src/gui/popups/popupmenu.cpp:2538
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:817
+#: src/gui/popups/popupmenu.cpp:843
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:888
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:914
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:894
+#: src/gui/popups/popupmenu.cpp:920
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1389
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1391
+#: src/gui/popups/popupmenu.cpp:1417
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1441
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1443
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1950
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1961
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1964
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Add to trade all"
 msgstr ""
 
@@ -1889,64 +1928,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/popups/popupmenu.cpp:2105
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "寄放"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1982
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2032
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:2035
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2038
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2011
+#: src/gui/popups/popupmenu.cpp:2057
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2061
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:2064
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2067
 msgid "Retrieve all"
 msgstr ""
 
@@ -1956,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2067 src/gui/popups/popupmenu.cpp:2856
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
@@ -1966,41 +2005,41 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2253
+#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2199 src/gui/popups/popupmenu.cpp:2260
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:2313
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
 msgid "Move down"
 msgstr ""
 
@@ -2008,155 +2047,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2426
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2447
+#: src/gui/popups/popupmenu.cpp:2493
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2574
-#: src/gui/popups/popupmenu.cpp:2613 src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2668
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2560
+#: src/gui/popups/popupmenu.cpp:2606
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2571 src/gui/popups/popupmenu.cpp:2589
-#: src/gui/popups/popupmenu.cpp:2601 src/gui/popups/popupmenu.cpp:2610
-#: src/gui/popups/popupmenu.cpp:2628
+#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2674
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2693
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2697
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2707 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2754
+#: src/gui/popups/popupmenu.cpp:2800
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2762
+#: src/gui/popups/popupmenu.cpp:2808
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2779
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2784
+#: src/gui/popups/popupmenu.cpp:2830
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2833
+#: src/gui/popups/popupmenu.cpp:2879
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2842
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2871 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2874
+#: src/gui/popups/popupmenu.cpp:2920
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2203,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2880 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丟棄"
@@ -2172,49 +2211,49 @@ msgstr "丟棄"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2898
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:2952
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2957
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:2960
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2917
+#: src/gui/popups/popupmenu.cpp:2963
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2920 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2971
 msgid "Kick"
 msgstr ""
 
@@ -2511,7 +2550,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
 #: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
 #: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
-#: src/input/pages/basic.cpp:210
+#: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "離開"
 
@@ -5158,7 +5197,7 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525
+#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5267,19 +5306,6 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
-#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
-#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
-#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
-#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
-#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
-#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
-msgid "Unequip"
-msgstr "卸下裝備"
-
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:56
 msgid "Did you know..."
@@ -6287,71 +6313,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
 msgid "Pickup"
 msgstr "撿拾"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:156
+#: src/input/pages/basic.cpp:162
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:162
+#: src/input/pages/basic.cpp:168
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:168
+#: src/input/pages/basic.cpp:174
 msgid "Screenshot"
 msgstr "螢幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:174
+#: src/input/pages/basic.cpp:180
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:180
+#: src/input/pages/basic.cpp:186
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:186
+#: src/input/pages/basic.cpp:192
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:192
+#: src/input/pages/basic.cpp:198
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:198
+#: src/input/pages/basic.cpp:204
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:204
+#: src/input/pages/basic.cpp:210
 msgid "Select OK"
 msgstr "選擇確定"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:216
+#: src/input/pages/basic.cpp:222
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:222
+#: src/input/pages/basic.cpp:228
 msgid "Return to safe video mode"
 msgstr ""